Merge branch 'release/1.1.1' v1.1.1
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 14 Jan 2015 16:31:19 +0000 (11:31 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 14 Jan 2015 16:31:19 +0000 (11:31 -0500)
commit4f4c599f2532bd084de1bf19b43685aa676be772
tree2787b07e04fbb9cd3df20c87e8872a06856132f4
parent7e60a4d300f1a624232d325450ef724588aa9b36
parent727d5aedb48652b318d3699ae485fe4549543611
Merge branch 'release/1.1.1'