Merge branch 'MDL-38744-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Apr 2013 23:13:57 +0000 (01:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Apr 2013 23:13:57 +0000 (01:13 +0200)
commitb19e8a1fb9398e16e2661a5253e79c00f6091047
treec5c6701f84ecf11f3dbd2c35301a34dc37426657
parentd29afc45779e5bb7b118d8008cad2d746940f984
parentebe558acb3e9df05d2b13481fd6988b53aa0ba2d
Merge branch 'MDL-38744-master' of git://github.com/danpoltawski/moodle