Merge branch 'master' into install_master
authorAMOS bot <amos@moodle.org>
Sat, 14 Sep 2013 00:41:33 +0000 (00:41 +0000)
committerAMOS bot <amos@moodle.org>
Sat, 14 Sep 2013 00:41:33 +0000 (00:41 +0000)
commita2c52dabefab5e57dbc84598ec46ddc0ea7b7c13
treea687b6cf3f51dee442a2474b4c94c8442444fa8c
parent2c9ac05f762f3ddaa54299c864939a2c72bbb0ba
parent83f26f640738a3e4de89d1765c66e4ceeb8503a8
Merge branch 'master' into install_master