Merge branch 'MDL-41733_master' of git://github.com/StudiUM/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 24 Sep 2013 06:33:50 +0000 (16:33 +1000)
committerMarina Glancy <marina@moodle.com>
Tue, 24 Sep 2013 06:33:50 +0000 (16:33 +1000)
commitc484e97f45ca89c0d773e9347da14442fd20af2c
tree21a9d0bd1243b8aa9d8cb8473ade199885633f05
parent84128f46b2381fdfccd49d05dc761bbd4ddf43c3
parentadbf94c95725c24b5b93afc8d3bc24fc057c6a17
Merge branch 'MDL-41733_master' of git://github.com/StudiUM/moodle