]> git.ipfire.org Git - people/pmueller/ipfire-3.x.git/commitdiff
projects / people / pmueller / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7fc5b51 37fa87c)
Merge remote-tracking branch 'stevee/docbook-manpages'
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 19 Oct 2011 17:29:32 +0000 (19:29 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 19 Oct 2011 17:29:32 +0000 (19:29 +0200)

Trivial merge
Peter's tree of IPFire 3.x