]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
projects / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9485620 97b3ade)
Merge remote-tracking branch 'stevee/vim'
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 21 Jul 2013 20:21:23 +0000 (22:21 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 21 Jul 2013 20:21:23 +0000 (22:21 +0200)

Trivial merge
IPFire 3.x development tree