Merge tag 'v3.13-final' into pandora-port
commit3736c5be3576ce80e792556d37c8c72f4d44507d
authorThomas Jarosch <tomj@simonv.com>
Sun, 10 Mar 2013 12:26:02 +0000 (10 13:26 +0100)
committerThomas Jarosch <tomj@simonv.com>
Sun, 10 Mar 2013 12:26:02 +0000 (10 13:26 +0100)
tree9e8002594ded6bf09808e10548351ac3c4cc6b9e
parent8f13096265125cced9489aa430b85ed487cf2e46
parent9ba57400c497a1a54d6203c5b3b2091cf523e2df
Merge tag 'v3.13-final' into pandora-port

All conflicting files were placed 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: If76b1d09be0648ccad7815b032a4fa923e5ba423