Merge branch 'MDL-1626-master' of git://github.com/andrewnicols/moodle
commit89d91403f9b4d2f0ca19e5e4f9c6d4e5631d7bb3
authorMarina Glancy <marina@moodle.com>
Tue, 24 Jun 2014 08:14:31 +0000 (24 16:14 +0800)
committerMarina Glancy <marina@moodle.com>
Tue, 24 Jun 2014 08:14:31 +0000 (24 16:14 +0800)
treef4714f7679820126a25a3ed8e14d64e1fd8e7086
parent582abd94141e1254c44ced8e8bfe37d20159c569
parentca14c76f3b3a18aadd63de1fe2c8ae09672115b3
Merge branch 'MDL-1626-master' of git://github.com/andrewnicols/moodle