Merge branch 'MDL-54644-master' of git://github.com/merrill-oakland/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 19 May 2016 16:57:04 +0000 (18:57 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 19 May 2016 16:57:04 +0000 (18:57 +0200)
commit5ba78f62316e32ea10c481405fd48d7a9f6e53ec
tree2a6a5d2fc489efd6149f727c346e462fa5a9e213
parent5d84a61419da9b5d6c3218ec4b516716b61d89ab
parent0a0dc5d035cba868a70fab9a82bf45bfec92939c
Merge branch 'MDL-54644-master' of git://github.com/merrill-oakland/moodle