]> git.ipfire.org Git - people/ms/ipfire-3.x.git/commitdiff
projects / people / ms / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 69db94b 371d4b9)
Merge branch 'master' into samba
authorChristian Schmidt <christian.schmidt@ipfire.org>
Tue, 1 May 2012 13:02:18 +0000 (15:02 +0200)
committerChristian Schmidt <christian.schmidt@ipfire.org>
Tue, 1 May 2012 13:02:18 +0000 (15:02 +0200)

Trivial merge
Michael's tree of IPFire 3.x.