Merge branch 'sbadia-swift'

Conflicts:
	AUTHORS
This commit is contained in:
Andrey Smirnov
2015-02-21 01:08:48 +03:00
36 changed files with 1088 additions and 24 deletions
+1
View File
@@ -14,3 +14,4 @@ List of contributors, in chronological order:
* Andrea Bernardo Ciddio (https://github.com/bcandrea)
* Michael Koval (https://github.com/mkoval)
* Alexander Guy (https://github.com/alexanderguy)
* Sebastien Badia (https://github.com/sbadia)