Merge pull request #387 from mhaskel/merge_1.6.x
authorTravis Fields <cyberious@users.noreply.github.com>
Fri, 21 Nov 2014 20:05:48 +0000 (15:05 -0500)
committerTravis Fields <cyberious@users.noreply.github.com>
Fri, 21 Nov 2014 20:05:48 +0000 (15:05 -0500)
commit1d20fa798ea3f32e195f1d950f1f53cb188c2705
treea652cd5a429f459044421dedda89327b8f41e007
parent1fad3f60709b6d0397f82665514707bfa2ac6526
parente5338f2e53bb47842576e1a2a4391335777e8271
Merge pull request #387 from mhaskel/merge_1.6.x

Merge 1.6.x