merge from 4.0.0 to trunk

svn: r20824
2012-12-22 18:07:18 +00:00
parent 261df75bea
commit 424fe3bd5b
13 changed files with 140 additions and 119 deletions
--- a/setup.py
+++ b/setup.py
@ -47,7 +47,7 @@ if sys.version_info[0] < 3:
    import commands
 from stat import ST_MODE

-VERSION = '4.0.0'
+VERSION = 'trunk'
 ALL_LINGUAS = ('bg', 'ca', 'cs', 'da', 'de', 'el', 'en_GB', 'es', 'fi', 'fr', 'he',
               'hr', 'hu', 'it', 'ja', 'lt', 'nb', 'nl', 'nn', 'pl', 'pt_BR',
               'pt_PT', 'ru', 'sk', 'sl', 'sq', 'sv', 'uk', 'vi', 'zh_CN')