Merge branch 'MDL-45444-master' of git://github.com/andrewnicols/moodle
commit6280e88d69c6db80eaee7b823be3a88bb7cb9b81
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 8 May 2014 10:40:27 +0000 (8 12:40 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 8 May 2014 10:40:27 +0000 (8 12:40 +0200)
treebdebbbb232c1e05acc35f57fc571a81c53f66d0d
parenta23a2ed19d68579c688dc6078458662671871b72
parent079c3a9446acfaf8d732321021143b35e9a7839a
Merge branch 'MDL-45444-master' of git://github.com/andrewnicols/moodle