Viewing all changes in revision 1272.
- Committer: Stephen Boyd
- Date: 2009-09-22 00:31:52 UTC
- mfrom: (1194.1.11)
- Revision ID: git-v1:f4eef5decc672ba4da32be30a16a33ca7385f02b
Merge branch 'maint-1.6.2'
Pickup changelog and throw away backported patches
Conflicts:
CHANGELOG
sonata/artwork.py
sonata/info.py
sonata/main.py
Pickup changelog and throw away backported patches
Conflicts:
CHANGELOG
sonata/artwork.py
sonata/info.py
sonata/main.py
- files modified:
- CHANGELOG
expand all
collapse all
added
removed
