]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commit
Merge remote-tracking branch 'amarx/ACCOUNTING' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 7 Aug 2014 12:59:17 +0000 (14:59 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 7 Aug 2014 12:59:17 +0000 (14:59 +0200)
commit89e9f46e5bbce78e0b528d183a7ed805ae998f1a
tree58913cac30bbc01dbca419b1c1da28a26176f131
parent908555842cdeb364a5c28ecfc4d901432f6afd33
parenta5f5ccfc4f49b825e17ae1334aa13512b1d41bc2
Merge remote-tracking branch 'amarx/ACCOUNTING' into next

Conflicts:
make.sh
make.sh