Merge remote-tracking branch 'origin/pr/484'

Conflicts: AUTHORS
2013-11-29 10:17:15 +00:00
parent 809473c15c eb975d7e13
commit 992c91dc0c
3 changed files with 5 additions and 0 deletions
--- a/1
+++ b/1
@@ -181,3 +181,4 @@ that much better:
 * Alexandr Morozov (https://github.com/LK4D4)
 * mishudark (https://github.com/mishudark)
 * Joe Friedl (https://github.com/grampajoe)
+ * Daniel Ward (https://github.com/danielward)