]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1f8dddc c199aa7)
Merge remote-tracking branch 'mfischer/slang' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 26 May 2015 12:27:32 +0000 (14:27 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 26 May 2015 12:27:32 +0000 (14:27 +0200)

Trivial merge
Peter's tree of IPFire 2.x