Merge branch 'dev'

Conflicts:
	sources/tag
This commit is contained in:
2014-08-19 14:01:42 +02:00
74 changed files with 1158 additions and 1462 deletions

View File

@@ -1 +1 @@
1.2.0
1.2.1