Merge pull request #251 from mhaskel/merge_1.3.x_to_master
authorBryan Jen <bryan.jen@gmail.com>
Thu, 21 May 2015 19:50:20 +0000 (12:50 -0700)
committerBryan Jen <bryan.jen@gmail.com>
Thu, 21 May 2015 19:50:20 +0000 (12:50 -0700)
commit118eb7bcbdc85e9b6d3778e4536b6940a3d23087
tree91b4dcb94e626a546a3956eda3585eb318f04465
parent3d3220033fd8be6d7314f995a087d72654d4b8cd
parente94d67588b368ae51671d777e0f0e53d24e28dea
Merge pull request #251 from mhaskel/merge_1.3.x_to_master

Merge 1.3.x to master