Merge branch 'release/1.1.0'
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Jan 2016 19:41:00 +0000 (14:41 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Jan 2016 19:41:00 +0000 (14:41 -0500)
commit9e58c4a0d760d376c050f773bf147c6931b705cb
treeaa9e37f73ef06d093a5b028efe20d96c5d2ad7bb
parent4d1085a4715ae861443b308335e1c3527dbdf4bf
parentd7a6c974831145388d5c490ee65a076f00f54a3d
Merge branch 'release/1.1.0'