Merge tag 'v1.1.6' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 14 Apr 2015 18:36:12 +0000 (14:36 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 14 Apr 2015 18:36:12 +0000 (14:36 -0400)
commitbf8fe4787ee1af99f51419c995ecfb8dee232bc2
treeca39c721e614ec5daad0876fcd3f27552b7e8734
parent608a04373c5fddeeaa1d1297a768147705b69196
parentf0ae5b23e15b693f7d379eaa4958679064215a2d
Merge tag 'v1.1.6' into develop

v1.1.6