From: Thomas Jarosch Date: Sun, 10 Mar 2013 10:13:24 +0000 (+0100) Subject: Merge tag 'v3.13-final' into maemo-port X-Git-Url: https://repo.or.cz/w/maemo-rb.git/commitdiff_plain/e75e5cea2c6e1fe17f606fe10fb377da9220bb54 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 --- e75e5cea2c6e1fe17f606fe10fb377da9220bb54