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

Conflicts: AUTHORS
2013-07-30 10:32:07 +00:00
parent 6efd6faa3f 80b3df8953
commit f1b1090263
2 changed files with 6 additions and 11 deletions
--- a/1
+++ b/1
@@ -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)