]> 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 11:15:15 +0000 (12:15 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 23 Dec 2011 11:15:15 +0000 (12:15 +0100)
commite8a67f9a0491af3395d7160cdb0270c7dcc1bfde
tree1a92c616692866cba0610c216ab9f2cebb6b44e3
parentd5c292cd031cb0a2b0797690db826a929a45f160
parent760886a8cf50776127bc9069e817df11e32282e4
Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire

Conflicts:
python/pakfire/packages/make.py
python/pakfire/packages/lexer.py
python/pakfire/packages/make.py