Merge branch 'bug/318' into dev

Conflicts:
	AUTHORS
This commit is contained in:
Ross Lawley
2011-11-29 03:46:11 -08:00
4 changed files with 27 additions and 2 deletions

View File

@@ -76,3 +76,4 @@ that much better:
* Adam Parrish
* jpfarias
* jonrscott
* Alice Zoë Bevan-McGregor