Merge remote-tracking branch 'origin/pr/412' into 412

Conflicts:
	AUTHORS
This commit is contained in:
Ross Lawley 2013-07-30 10:32:07 +00:00
commit f1b1090263
2 changed files with 6 additions and 11 deletions

View file

@ -173,3 +173,4 @@ that much better:
* Kelvin Hammond (https://github.com/kelvinhammond)
* Jatin- (https://github.com/jatin-)
* Paul Uithol (https://github.com/PaulUithol)
* Thom Knowles (https://github.com/fleat)