chiark / gitweb /
Merge remote branch 'upstream/master'
authorIvo Ugrina <ivo@iugrina.com>
Fri, 7 Oct 2011 23:20:32 +0000 (01:20 +0200)
committerIvo Ugrina <ivo@iugrina.com>
Fri, 7 Oct 2011 23:20:32 +0000 (01:20 +0200)

Trivial merge