Merge branch 'MDL-38621_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Apr 2013 00:27:10 +0000 (02:27 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Apr 2013 00:27:10 +0000 (02:27 +0200)
commit342c3f3e6c73f4aabdae61bd8a38a23784149485
tree12db7f45675fa8ef5926296621e421caf507a684
parent3e275484317a0a360b7ef9e81e330c06444ff77f
parent3ea8721a0cf4fc6fe48cfa5ac32f3db19a3bb6d8
Merge branch 'MDL-38621_master' of git://github.com/dmonllao/moodle