]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 89e9f46 d6413ca)
Merge remote-tracking branch 'amarx/ACCOUNTING' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 7 Aug 2014 13:11:47 +0000 (15:11 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 7 Aug 2014 13:11:47 +0000 (15:11 +0200)

Trivial merge
IPFire 2.x development tree