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)
commit14fc9f124edb76a5426c1a166e984947a26c437e
treedb9424af8416089dc74f913dd8f15b10fa5b86f5
parent056e5f9b640771d156c500be038e50547214c862
parent658fa37e638732325eac9f46c37da82a11fbe38e
Merge pull request #312 from cdunn2001/master

gcc-4.9, clang (3.0)