Merge commit 'v0.4' into diablo
authorJuan A. Suarez Romero <jasuarez@igalia.com>
Wed, 17 Mar 2010 09:27:11 +0000 (10:27 +0100)
committerJuan A. Suarez Romero <jasuarez@igalia.com>
Wed, 17 Mar 2010 09:27:11 +0000 (10:27 +0100)
commit9c7822c93acaf359a1170929628d5f3d89a11da3
tree252d9f69b7cbfc9a0b9edd211733e79c41d1eb92
parent70b23196699fd327944d721fb0515ae27d1a4569
parentde6bc34d59a6a3b8f4e3a6875e893513cf53a0c9
Merge commit 'v0.4' into diablo

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