Merge branch 'release/0.2.5' v0.2.5
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 3 Dec 2015 14:35:41 +0000 (09:35 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 3 Dec 2015 14:35:41 +0000 (09:35 -0500)
commit20f620375d643f14ec8ab7342cc2de707eac5085
tree278a924950102ffeee70cf9875b647c84b6a6bb5
parent0bbe75c9e657cc881746a2141b15852bba3639fa
parent3b1f861e42af355c37467814edc07a7a90517210
Merge branch 'release/0.2.5'