Merge pull request #542 from volnt/master
authorAaron Hill <aa1ronham@gmail.com>
Thu, 15 Jan 2015 11:35:58 +0000 (06:35 -0500)
committerAaron Hill <aa1ronham@gmail.com>
Thu, 15 Jan 2015 11:35:58 +0000 (06:35 -0500)
Fix issue #541


Trivial merge