Merge with origin:dev

This commit is contained in:
Gregory Soutade
2014-12-31 14:22:46 +01:00
parent a17bbbccf8
commit f1fb8cb674
10 changed files with 157 additions and 37 deletions

3
.gitignore vendored Normal file
View File

@@ -0,0 +1,3 @@
*~
*.pyc
*.gz