Merge branch 'master' into install_master
authorAMOS bot <amos@moodle.org>
Sat, 19 Nov 2011 00:30:59 +0000 (00:30 +0000)
committerAMOS bot <amos@moodle.org>
Sat, 19 Nov 2011 00:30:59 +0000 (00:30 +0000)
commit967bc47c80346cf6280f2a1385fc50df926cde36
tree22a92df1cc1268c4111b303a8986b2cd13614c0c
parent00db87ad385864ba7408949c6a76e18023c8bb2b
parentfe41ba7489f5a44e7325d20442e01751c7736d0a
Merge branch 'master' into install_master