Merge branch 'MDL-49224-master' of git://github.com/jethac/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Mar 2015 23:16:01 +0000 (00:16 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Mar 2015 23:16:01 +0000 (00:16 +0100)
commit3bafe5ebeedfbbb5afcc8e4e0e5521b4b1898834
tree4e4e0e539d1914ffdefed05d1ce8d74f08c5bb29
parent338de2ed78beb72b1f93d610593d97cb9cf75721
parent343b11a3fae05bbbb55d0bd8c5c155bca7a9aa0c
Merge branch 'MDL-49224-master' of git://github.com/jethac/moodle