]> 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: 7abab4a 58e0cdc)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x into samba4
authorAlexander Marx <alexander.marx@ipfire.org>
Fri, 9 Sep 2016 08:52:28 +0000 (08:52 +0000)
committerAlexander Marx <alexander.marx@ipfire.org>
Fri, 9 Sep 2016 08:52:28 +0000 (08:52 +0000)

Trivial merge
Alex's tree of IPFire 3.x