Merge tag 'v1.4.8' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 6 May 2015 16:30:03 +0000 (12:30 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 6 May 2015 16:30:03 +0000 (12:30 -0400)
1.4.8


Trivial merge