Merge pull request #312 from cdunn2001/master
authorChristopher Dunn <cdunn2001@gmail.com>
Sun, 12 Jul 2015 17:04:41 +0000 (12:04 -0500)
committerChristopher Dunn <cdunn2001@gmail.com>
Sun, 12 Jul 2015 17:04:41 +0000 (12:04 -0500)
gcc-4.9, clang (3.0)


Trivial merge