Merge branch 'MDL-30700-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 13 Dec 2012 09:31:59 +0000 (10:31 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 13 Dec 2012 09:31:59 +0000 (10:31 +0100)
commit04e56da75f96720513f0d363cc08f1438b2ec051
tree6657b351bc5ccf1e316a74f78367af61a53f33a9
parentaa3258d5869cfdb503f8eb22a0d0fe9bb7c07e33
parentd495f2d75ed247f9468907ae593abca774b1273d
Merge branch 'MDL-30700-master' of git://github.com/damyon/moodle