From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 3 Mar 2012 17:47:17 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
X-Git-Tag: 0.9.21~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=949b8c96ebe2a445afee2adf47cf0c12a6578896;p=pakfire.git

Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire

Conflicts:
	python/pakfire/transaction.py
---

949b8c96ebe2a445afee2adf47cf0c12a6578896