Merge pull request #502 from mhaskel/merge_2.0.x_to_master
authorBryan Jen <bryan.jen@gmail.com>
Wed, 22 Apr 2015 17:19:45 +0000 (10:19 -0700)
committerBryan Jen <bryan.jen@gmail.com>
Wed, 22 Apr 2015 17:19:45 +0000 (10:19 -0700)
commitbca85cd945f8511edb0aa2dcf5e549772abea805
tree3099492dc9942fc964f929daa26d5acf9decc864
parente671b38635b7d0ec8baff171cc8d389731ffa238
parent6816f99c28b5d5b735d00e465de96e73ba1dbcc9
Merge pull request #502 from mhaskel/merge_2.0.x_to_master

Merge 2.0.x to master