Merge branch 'MDL-41451_master' of https://github.com/pauln/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 10 Sep 2013 03:59:29 +0000 (11:59 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 10 Sep 2013 03:59:29 +0000 (11:59 +0800)
commitcc93ed2698eb0d4b565a138f5293217a0ed729ce
tree06ba914144e963395b3aa9ace0469c4c9f5857b0
parentc0382dd012d7c080a19a66c17b6e89182f8db8e8
parent59de73509506d25c4f949afe714db92f32c0d124
Merge branch 'MDL-41451_master' of https://github.com/pauln/moodle