]> 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: 3efbf9a 16d8ba5)
Merge remote-tracking branch 'stevee/qt'
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 24 May 2012 08:40:45 +0000 (10:40 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 24 May 2012 08:40:45 +0000 (10:40 +0200)

Trivial merge
IPFire 3.x development tree