Merge remote-tracking branch 'refs/remotes/moggers87/garbage-branch'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 19 Sep 2014 21:25:35 +0000 (16:25 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 19 Sep 2014 21:25:35 +0000 (16:25 -0500)

Trivial merge