Merge branch 'MDL-42959-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 10 Dec 2013 21:34:17 +0000 (10:34 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 10 Dec 2013 21:34:17 +0000 (10:34 +1300)
commitebb9daa5e1cf196b6f7fde63ed5127a867d1f80b
treedfa8a0f7a616708e849ab4a825e2a3a831a4bc63
parentb6df1b3ab36e7aef65e82cf03f32ad2ba446144f
parent5f77a55984eccf9f77a67e8aa087c4bf2a4e2075
Merge branch 'MDL-42959-master' of git://github.com/andrewnicols/moodle