Merge pull request #259 from mhaskel/merge_1.3.x_to_master
authorBryan Jen <bryan.jen@gmail.com>
Thu, 30 Jul 2015 23:25:48 +0000 (16:25 -0700)
committerBryan Jen <bryan.jen@gmail.com>
Thu, 30 Jul 2015 23:25:48 +0000 (16:25 -0700)
commit266b20510b9eec7e8e91096f5aa370ae52a136e7
treeeba5c00e860b9df95a4a682f1a9134fab8b84486
parent231f711e3f0ccb8601bea55f0e6d562b8674488e
parent56d55ee4426ddcbcf568d5b413ed780812738657
Merge pull request #259 from mhaskel/merge_1.3.x_to_master

Merge 1.3.x to master