Merge branch 'MDL-39463_master' of https://github.com/markn86/moodle
commit919a8db0a26da1b96b236bfef111712aaea5e1a6
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 May 2013 22:35:28 +0000 (9 00:35 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 May 2013 22:35:28 +0000 (9 00:35 +0200)
tree486d9da815da0452d62967e913f5f157e724b329
parent474e0d3cd20ae9a754f937ae3136fd4b5ed2ae3a
parente019dcccdf5d5d75ffc41e775c4932a364ad1da7
Merge branch 'MDL-39463_master' of https://github.com/markn86/moodle