Merge pull request #314 from cdunn2001/master
authorChristopher Dunn <cdunn2001@gmail.com>
Sun, 12 Jul 2015 19:38:02 +0000 (14:38 -0500)
committerChristopher Dunn <cdunn2001@gmail.com>
Sun, 12 Jul 2015 19:38:02 +0000 (14:38 -0500)
commit81cf237917b6873decd27e15b7fe8473003a2762
tree3c6faca67639ff5dfb49090ecb80b011eb4fbef5
parentf94a0e8989150d2224e731a037e9546580a2924b
parentcac79543f8c7cf8dab7ffcaff77e10284f173ed4
Merge pull request #314 from cdunn2001/master

-Werror

plus small bug-fix