Merge branch 'MDL-33198-master' of git://github.com/ankitagarwal/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Sep 2012 18:04:58 +0000 (20:04 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Sep 2012 18:04:58 +0000 (20:04 +0200)
commit05b7836ff7ba1647b1ef1d3381d7d9ef861d425d
tree5e06377351f91fe2b146154d1f075ab6a5ec154e
parent543951c574e6d852441c8af9481d8feaa1decc15
parent98e8c0c76d12f17b27d6729fcf24739099315109
Merge branch 'MDL-33198-master' of git://github.com/ankitagarwal/moodle