merged upstream changes

This commit is contained in:
Cameron Moon
2013-02-11 10:06:40 +11:00
12 changed files with 283 additions and 48 deletions

View File

@ -82,6 +82,7 @@ Contributors
[mledoze](https://github.com/mledoze),
[OshiHidra](https://github.com/OshiHidra),
[Scrool](https://github.com/Scrool),
[sorgo](https://github.com/sorgo),
[Xelio](https://github.com/Xelio),
[ZauberNerd](https://github.com/ZauberNerd)