Merge branch 'maint'
authorAndre Noll <maan@systemlinux.org>
Tue, 6 Oct 2009 21:16:27 +0000 (23:16 +0200)
committerAndre Noll <maan@systemlinux.org>
Tue, 6 Oct 2009 21:16:27 +0000 (23:16 +0200)
commit4108592dd3ac3a4cbee530b64c6f9c8b6a60be99
tree14674c1e34f0b88cb8f949e5e081d86a255ff591
parent878bd60c5bdc2e4e5c7063cf742bcd0d3f8dcfa1
parentac6cf1cb1b7013422360f703f82c92716376de3a
Merge branch 'maint'
.gitignore