]> git.ipfire.org Git - people/jschlag/ipfire-2.x.git/commitdiff
projects / people / jschlag / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ad94069 39c445a)
Merge remote-tracking branch 'origin/thirteen' into thirteen
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 4 Sep 2012 19:25:31 +0000 (21:25 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 4 Sep 2012 19:25:31 +0000 (21:25 +0200)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.