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

author Michael Tremer <michael.tremer@ipfire.org>

Sun, 20 Nov 2011 00:28:57 +0000 (01:28 +0100)

committer Michael Tremer <michael.tremer@ipfire.org>

Sun, 20 Nov 2011 00:28:57 +0000 (01:28 +0100)
author Michael Tremer <michael.tremer@ipfire.org>
Sun, 20 Nov 2011 00:28:57 +0000 (01:28 +0100)
committer Michael Tremer <michael.tremer@ipfire.org>
Sun, 20 Nov 2011 00:28:57 +0000 (01:28 +0100)
diff --cc python/pakfire/builder.py
Simple merge
diff --cc python/pakfire/constants.py
Simple merge
diff --cc python/pakfire/packages/make.py
Simple merge
author	Michael Tremer <michael.tremer@ipfire.org>
	Sun, 20 Nov 2011 00:28:57 +0000 (01:28 +0100)
committer	Michael Tremer <michael.tremer@ipfire.org>
	Sun, 20 Nov 2011 00:28:57 +0000 (01:28 +0100)
		1	2
python/pakfire/builder.py	patch \|	diff1 \|	diff2 \|	blob \| history
python/pakfire/constants.py	patch \|	diff1 \|	diff2 \|	blob \| history
python/pakfire/packages/make.py	patch \|	diff1 \|	diff2 \|	blob \| history