]> git.ipfire.org Git - people/amarx/ipfire-3.x.git/commitdiff
projects / people / amarx / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c0a8c22 5dfd48b)
Merge branch 'master' into samba
authorChristian Schmidt <christian.schmidt@ipfire.org>
Mon, 30 Apr 2012 17:14:38 +0000 (19:14 +0200)
committerChristian Schmidt <christian.schmidt@ipfire.org>
Mon, 30 Apr 2012 17:14:38 +0000 (19:14 +0200)

Trivial merge
Alex's tree of IPFire 3.x