Merge branch 'release/1.1.2' V1.1.2
authorLaury GvR <laury@gaslightmedia.com>
Wed, 6 Aug 2014 18:32:40 +0000 (14:32 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 6 Aug 2014 18:32:40 +0000 (14:32 -0400)
commit31b21063ed521ca25539bff779e049d9f55881dd
tree55eeff6870c17b8ad326934af353f6b2ede84ed5
parent220cc00098d43612a07f13818d80bbb4d8b5900f
parentac167ae111d12e05ac544196aeeb0c505956c9a3
Merge branch 'release/1.1.2'