chiark / gitweb /
Merge remote branch 'kay/master'
authorLennart Poettering <lennart@poettering.net>
Tue, 2 Feb 2010 11:51:04 +0000 (12:51 +0100)
committerLennart Poettering <lennart@poettering.net>
Tue, 2 Feb 2010 11:51:04 +0000 (12:51 +0100)

Trivial merge