picard:1.3.1

Last commit made on 2014-12-20
Get this branch:
git clone -b 1.3.1 https://git.launchpad.net/picard

Branch merges

Branch information

Name:
1.3.1
Repository:
lp:picard

Recent commits

75f72e6... by Laurent Monin

Remove 1.4 entirely from the 1.3.1 branch

Suggested by Freso

60ca24e... by Laurent Monin

Update NEWS.txt

969c6fc... by Laurent Monin

Update version to 1.3.1

c0c9213... by Laurent Monin

Update translations

275a327... by Laurent Monin

Update attributes.py

01242a0... by Wieland Hoffmann

Merge branch 'PICARD-663' of https://github.com/phw/picard

(cherry picked from commit 7bd95c46beb3cd880632fefd426993b7fe1e9661)

56c1728... by Laurent Monin <email address hidden>

Merge pull request #388 from phw/PICARD-642-config-upgrade-error

Fix errors during configuration update when reading obsolete options.
(cherry picked from commit 0e4341027ad7dab8de5e4240a73c1229dd274e73)

eb2860a... by Laurent Monin

Merge pull request #386 from Sophist-UK/drunkendwarf_webservice_noport

Use https if port 443 is specified, and only provide a specific port if it is not 80 or 443.
(cherry picked from commit 055a1ba8286cf059749bdc764ff90bcfe0dc3a50)

Conflicts:
 picard/webservice.py

425fc66... by Laurent Monin

Remove useless comment, commit message is enough

https://github.com/musicbrainz/picard/commit/f03145ed0fffad05e426cce4a37bacfda38d3b78#commitcomment-8865743
(cherry picked from commit 235ff26b0dbdfb9541aec1956c1d3a318e52f954)

bd8c64e... by Laurent Monin <email address hidden>

Merge pull request #381 from zas/PICARD-662_fix

 PICARD-662: skip collections having "entity_type" != "release"
(cherry picked from commit 88c5cdd17fdd8a11b22720a74fea64ae4d396370)