Merge branch 'MDL-29896-master' of git://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Jan 2012 00:16:49 +0000 (01:16 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Jan 2012 00:16:49 +0000 (01:16 +0100)
commit00a4543c5b5482bdeea39f543614c636ad47955e
tree45144377d527b6d035d828b4509ecd218f101027
parent478ba353b0dd6ca999a9afb27b1855b4ff942827
parent5ad40d0e19214d1082cfd9c1276417917552a236
Merge branch 'MDL-29896-master' of git://github.com/sammarshallou/moodle