Merge branch 'seuros-more'
authorSteven Bazyl <sqrrrl@gmail.com>
Mon, 15 Dec 2014 19:54:03 +0000 (11:54 -0800)
committerSteven Bazyl <sqrrrl@gmail.com>
Mon, 15 Dec 2014 19:54:03 +0000 (11:54 -0800)
commitd6d8ec7884639f6b6a2a81e0125d8ac6071e6db4
treefdf38d32d2b113237e357d0933bb28067851597e
parent7ac37a54f05cc975ed26a77e204ffb650ccca1e4
parentf8ca44f9caf2d63a8d145e47038b2bdbd0766a26
Merge branch 'seuros-more'