Merge branch 'master' into development

This commit is contained in:
Philipp Schaefer 2013-10-22 19:17:50 +02:00
commit 7fae77099f

View File

@ -8,7 +8,9 @@ So far, these people have contributed:
[ccjon](https://github.com/ccjon),
[cmrn](https://github.com/cmrn),
[epf](https://github.com/epf),
[fkloft](https://github.com/fkloft),
[Fragger](https://github.com/Fragger),
[hastarin](https://github.com/hastarin),
[integ3r](https://github.com/integ3r),
[j16sdiz](https://github.com/j16sdiz),
[JasonMillward](https://github.com/JasonMillward),