Merge branch 'MDL-45031_M28' of git://github.com/lazydaisy/moodle
commit9ab115bbeee35516407a00e60b8033a42b7b29f6
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Aug 2014 22:34:03 +0000 (13 00:34 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Aug 2014 22:34:03 +0000 (13 00:34 +0200)
treeaca442aed052d2066dc4e0bbc61e422866483412
parentb8475d375c07364f2a576c0a865ef1aa028fc913
parent0b181e9a4ddf009f531cc36f76af9d6dfb6ab4ce
Merge branch 'MDL-45031_M28' of git://github.com/lazydaisy/moodle