Merge commit 'v0.3.6' into diablo
authorJuan A. Suarez Romero <jasuarez@igalia.com>
Tue, 9 Mar 2010 22:08:12 +0000 (23:08 +0100)
committerJuan A. Suarez Romero <jasuarez@igalia.com>
Tue, 9 Mar 2010 22:08:12 +0000 (23:08 +0100)
commit953b2f6a45e69848ee5deeb4538e1f862444ac40
treea2f735aea5200ae5d8094d55c4b3e7486a16fee1
parentc2d68245c2f7744fa278390b33d75f4df5f1863b
parent687e37fe56dc3dbccb69735ef2888021deaedd87
Merge commit 'v0.3.6' into diablo

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