Merge remote-tracking branch 'origin/master' into dev

This commit is contained in:
Dave Halter committed 2014-07-23 00:47:30 +02:00
commit a01e4c6b37
4 files changed
+23 -20

No files matched your search

+1 -1
View File
@@ -7,7 +7,7 @@ Takafumi Arakaki (@tkf) <aka.tkf@gmail.com>
Code Contributors
=================
Danilo Bargen (@dbrgn) <gezuru@gmail.com>
Danilo Bargen (@dbrgn) <mail@dbrgn.ch>
Laurens Van Houtven (@lvh) <_@lvh.cc>
Aldo Stracquadanio (@Astrac) <aldo.strac@gmail.com>
Jean-Louis Fuchs (@ganwell) <ganwell@fangorn.ch>