Salvatore Orlando 8d6978e987 merge trunk, fixed conflicts

2011-03-28 15:58:06 +01:00

..

__init__.py

first merge after i18n

2010-12-23 02:09:50 +00:00

stubs.py

merge trunk, fixed conflicts

2011-03-28 15:58:06 +01:00