]> 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: df6b9eb 480f354)
Merge remote-tracking branch 'alfh/bugfix_openbox_center' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 27 Feb 2014 12:36:38 +0000 (13:36 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 27 Feb 2014 12:36:38 +0000 (13:36 +0100)

Trivial merge
Peter's tree of IPFire 2.x