chiark / gitweb /
Merge pull request #123 from buserror-uk/for-upstream
authorErikZalm <erik@vdzalm.eu>
Fri, 23 Mar 2012 18:54:58 +0000 (11:54 -0700)
committerErikZalm <erik@vdzalm.eu>
Fri, 23 Mar 2012 18:54:58 +0000 (11:54 -0700)
For upstream


Trivial merge