chiark / gitweb /
Merge remote branch 'upstream/master'
authorIvo Ugrina <ivo@iugrina.com>
Tue, 4 Oct 2011 21:45:23 +0000 (23:45 +0200)
committerIvo Ugrina <ivo@iugrina.com>
Tue, 4 Oct 2011 21:45:23 +0000 (23:45 +0200)

Trivial merge