edx/edx-platform — pull request #222 by fephsun (2013-06-20 14:20:47+00:00)
Title: Fixed the preferences scope of xblock.

Added self to authors.

Conflicts:
AUTHORS
CHANGELOG.rst