Merge remote-tracking branch 'origin/pr/346' into 345

Conflicts:
	AUTHORS
	docs/guide/signals.rst
This commit is contained in:
Ross Lawley
2013-06-04 09:35:26 +00:00
3 changed files with 111 additions and 20 deletions

View File

@@ -77,7 +77,7 @@ that much better:
* Adam Parrish
* jpfarias
* jonrscott
* Alice Zoë Bevan-McGregor
* Alice Zoë Bevan-McGregor (https://github.com/amcgregor/)
* Stephen Young
* tkloc
* aid