]> git.ipfire.org Git - people/ms/ipfire-2.x.git/commitdiff
projects / people / ms / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4bd6b58 656ab28)
Merge remote-tracking branch 'origin/next' into thirteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 23 Sep 2012 14:08:43 +0000 (10:08 -0400)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 23 Sep 2012 14:08:43 +0000 (10:08 -0400)

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