]> git.ipfire.org Git - oddments/cappie.git/commit
Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/cappie master
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 11 May 2010 21:58:54 +0000 (23:58 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 11 May 2010 21:58:54 +0000 (23:58 +0200)
commita8e7cbae2e04045809e48b417edeaff74f75af9e
treec56e0b3a4295b3341c3df32da24a3121d8284110
parent64e40ed09d56387130e212f563644c8e23ff672e
parent54e92b606bae60e47af1739bb0d146de1769bf74
Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/cappie

Conflicts:
cappie/__init__.py
cappie/queue.py
cappie/__init__.py
cappie/queue.py