Merge pull request #484 from mhaskel/merge_master_to_next
authorDaniele Sluijters <daenney@users.noreply.github.com>
Thu, 26 Mar 2015 07:48:14 +0000 (08:48 +0100)
committerDaniele Sluijters <daenney@users.noreply.github.com>
Thu, 26 Mar 2015 07:48:14 +0000 (08:48 +0100)
commit913a64e1fd9a383cfa39a2bb7487cb2e76d79fa1
tree75500f9e441adc2c3d3be6c19ad56874e270b707
parent6d12a039b78a9a5dcdbc76b703c6bb8b3efd42fe
parentdc746734f17faa996e8441d176143945e8347330
Merge pull request #484 from mhaskel/merge_master_to_next

Merge master to next