Merge branch 'hotfix/1.1.5' v1.1.5
authorIan Weller <ian@gaslightmedia.com>
Fri, 8 Aug 2014 15:49:31 +0000 (11:49 -0400)
committerIan Weller <ian@gaslightmedia.com>
Fri, 8 Aug 2014 15:49:31 +0000 (11:49 -0400)
commit187c7eb3d61a81542476d01fde174133efb53c28
tree6ee716ff926e74e5b1f2115ace1bfbef56f50bb1
parent7fe4a8cc2df8214ac6fda00b1b4e4696da2f131a
parentc9e9a3a21bb369f11d0e195423c8163ad6c70db8
Merge branch 'hotfix/1.1.5'