Merge commit 'v0.6.1' into diablo v0.6.1diablo
authorJuan A. Suarez Romero <jasuarez@igalia.com>
Wed, 21 Jul 2010 19:09:43 +0000 (21:09 +0200)
committerJuan A. Suarez Romero <jasuarez@igalia.com>
Wed, 21 Jul 2010 19:11:38 +0000 (21:11 +0200)
commitec2358ef996406f4a64ede1c2b56e3986375dd84
tree918505f2f3fb7793aec4a9d945b85ff2bf1c19f7
parentc6e179660ebf213db94ed156041fd69e5ff08e62
parentf2359bb55e577b74e16c1f2a4437c3807ac2dec7
Merge commit 'v0.6.1' into diablo

Conflicts resolved:
debian/changelog
src/SeriesFinale/gui.py
debian/changelog
src/SeriesFinale/gui.py
src/SeriesFinale/lib/constants.py