Merge branch 'release-1.1.0' into releases
authorDan Vanderkam <danvdk@gmail.com>
Wed, 3 Dec 2014 22:15:08 +0000 (17:15 -0500)
committerDan Vanderkam <danvdk@gmail.com>
Wed, 3 Dec 2014 22:15:08 +0000 (17:15 -0500)
commit00e6201249818037966d845f81b77dd8db5aea56
tree8e106e2943f1cbaffb6cc91834ea86b9d2e5bd18
parent2628bb266d5501d7e404a6bdc7858946048368b5
parent615a5c1fb9b97579ee967731c60c753802a72304
Merge branch 'release-1.1.0' into releases