Git commits in Moodle 2.5.1 by Sam Chaffee

commit 7991637057ca853ad9043ea1471234e97d832670
Author: Sam Chaffee <sam@moodlerooms.com>
Date:   Fri, 21 Jun 2013 03:54:03 +0800
Tag:    v2.5.1

MDL-40258: Fixed invalid json string error in file-picker