Merge branch 'hotfix/1.1.3' v1.1.3
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 15 Aug 2014 13:45:23 +0000 (09:45 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 15 Aug 2014 13:45:23 +0000 (09:45 -0400)
commit18c01e796db1f4de9ebb5da2f85e8c61a90145de
tree61296673af0210107b4c0066d5f5775dc60aeb4c
parent31b21063ed521ca25539bff779e049d9f55881dd
parentcf3e76ab41ccd2c2eecd8ba2dda8b8e8244cbf15
Merge branch 'hotfix/1.1.3'