Merge branch 'MDL-32985_integration' of git://github.com/merrill-oakland/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 7 Jun 2012 22:04:19 +0000 (00:04 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 7 Jun 2012 22:04:19 +0000 (00:04 +0200)
commit03a94794fc6fcae6ff3c8635b32e0bdd6909054f
treefdb6b871305e67aa1faf665dd4a966672b5e6ad2
parenta15e8b41019488d57a9b53f97ef150e11cbb0af5
parent54c2756ca21e74ad89a5c922e47287477f3add55
Merge branch 'MDL-32985_integration' of git://github.com/merrill-oakland/moodle