Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Marko Tibold 2011-12-30 16:40:06 +01:00
commit 0bf89f267e

View File

@ -21,6 +21,7 @@ Thomas Steinacher <thomasst>
Meurig Freeman <meurig> Meurig Freeman <meurig>
Anthony Nemitz <anemitz> Anthony Nemitz <anemitz>
Ewoud Kohl van Wijngaarden <ekohl> Ewoud Kohl van Wijngaarden <ekohl>
Michael Ding <yandy>
THANKS TO: THANKS TO: