Merge tag 'v3.13-final' into maemo-port
authorThomas Jarosch <tomj@simonv.com>
Sun, 10 Mar 2013 10:13:24 +0000 (11:13 +0100)
committerThomas Jarosch <tomj@simonv.com>
Sun, 10 Mar 2013 10:13:24 +0000 (11:13 +0100)
commite75e5cea2c6e1fe17f606fe10fb377da9220bb54
tree9e8002594ded6bf09808e10548351ac3c4cc6b9e
parent65f659e280449092296eef241c96b595602543a3
parent9ba57400c497a1a54d6203c5b3b2091cf523e2df
Merge tag 'v3.13-final' into maemo-port

Resolved conflicts by replacing all files
with the version from v3.13-final.

Conflicts:
tools/builds.pm
tools/release/bins.pl
tools/release/manuals.pl
tools/release/voices.pl

Change-Id: I1b0bc303c06b4132d4ae698ed59e868799fd5c8f