]> 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>
Fri, 23 Dec 2011 20:12:45 +0000 (21:12 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 23 Dec 2011 20:12:45 +0000 (21:12 +0100)
commit8bf57e898099dc5c87ff56660df02e00af09c0f6
tree23b28653829d963f31c942ba75433cfbec01c8bd
parentaad6f600c1bdf5e4d90a7265959b2780d76d339a
parent7709931085230499a594ff47760fd9d41f603839
Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire

Conflicts:
po/pakfire.pot
po/pakfire.pot
python/pakfire/packages/make.py