Merge remote-tracking branch 'gh-nemobis/patch-1'
authorBenjamin Mako Hill <mako@atdot.cc>
Fri, 18 Jul 2014 21:34:27 +0000 (14:34 -0700)
committerBenjamin Mako Hill <mako@atdot.cc>
Fri, 18 Jul 2014 21:34:27 +0000 (14:34 -0700)

Trivial merge

Benjamin Mako Hill || Want to submit a patch?