Merge branch 'MDL-47002-int-master' of git://github.com/merrill-oakland/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Mar 2015 17:17:17 +0000 (18:17 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Mar 2015 17:17:17 +0000 (18:17 +0100)
commit54c40ffe7538d54e8ac7ca5387550fad0d7e3a0e
treeb9af68429ac47499a8ac31dfca1d716c7d95f7e3
parent21e864c98383f21b6c2b39feb7b0ee8a4e4e27df
parent665829ec2a035b893a77a38fb16c8b48e36ea415
Merge branch 'MDL-47002-int-master' of git://github.com/merrill-oakland/moodle