Merge pull request #530 from elanting/master
authorAaron1011 <aa1ronham@gmail.com>
Thu, 18 Dec 2014 11:26:32 +0000 (06:26 -0500)
committerAaron1011 <aa1ronham@gmail.com>
Thu, 18 Dec 2014 11:26:32 +0000 (06:26 -0500)
fixed issue #529


Trivial merge