]> 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: 995af6a e240a30)
Merge remote-tracking branch 'stevee/vim'
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 21 Jul 2013 20:16:31 +0000 (22:16 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 21 Jul 2013 20:16:31 +0000 (22:16 +0200)

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