Merge branch 'master' into master-2

# Conflicts:
#	LICENSE
This commit is contained in:
stubbfel
2015-03-27 00:06:28 +01:00
parent 8f42134415
commit 7cf755493c
29 changed files with 669 additions and 0 deletions

View File

@@ -0,0 +1 @@
__author__ = 'dev'