Merge pull request #9 from dedeckeh/master
authorsbyx <steven@midlink.org>
Mon, 30 Dec 2013 17:15:54 +0000 (09:15 -0800)
committersbyx <steven@midlink.org>
Mon, 30 Dec 2013 17:15:54 +0000 (09:15 -0800)

Trivial merge