Merge branch '2016-06' of github.com:swcarpentry/styles into 2016-06
authorGreg Wilson <gvwilson@third-bit.com>
Mon, 27 Jun 2016 00:46:42 +0000 (20:46 -0400)
committerGreg Wilson <gvwilson@third-bit.com>
Mon, 27 Jun 2016 00:46:42 +0000 (20:46 -0400)
commit40dbc703e9fcc162aca3244c92a552acc4805db4
tree7d3eb56906c1a7a7fc2efd75d581b1d9f574551f
parent079d7d50e9e2235aa0c99fc687ef30135dcfad53
parent4c788a5b2f0f1ed76c40c3e017cccbb0a85cdd08
Merge branch '2016-06' of github.com:swcarpentry/styles into 2016-06