chiark / gitweb /
Merge remote-tracking branch 'harald/master'
authorLennart Poettering <lennart@poettering.net>
Mon, 11 Jul 2011 20:39:57 +0000 (22:39 +0200)
committerLennart Poettering <lennart@poettering.net>
Mon, 11 Jul 2011 20:39:57 +0000 (22:39 +0200)
commit7e2bb92dcae6ee785ff7462aadc8c369fd93715b
treeb24a7f80c4a292f77f71dc0990a7397f038fe41a
parent2fb1aedaf2493d9598693c123d5e9c168ca1b3c1
parent7cb1094acefff2a89dc842d84eb94a8afcac67fd
Merge remote-tracking branch 'harald/master'