]> git.ipfire.org Git - pakfire.git/commit
Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 3 Mar 2012 17:47:17 +0000 (18:47 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 3 Mar 2012 17:47:17 +0000 (18:47 +0100)
commit949b8c96ebe2a445afee2adf47cf0c12a6578896
tree412156b5a4956e5e831c8587bb6a8d23572c2871
parent2ad59b6e61e5366bfa62940809e205845b8e1c02
parentd5166686f917b5b85f3e5957e0535490e2d16f6e
Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire

Conflicts:
python/pakfire/transaction.py