Merge branch 'MDL-25834' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Mar 2011 20:54:57 +0000 (21:54 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Mar 2011 20:54:57 +0000 (21:54 +0100)
commitbc35885cb4755fa966dc38fb70a0490e09ee1d33
tree135552484fe84899653a05a31ae8c9cb75e55ff1
parentb9c6ce2d19f65aff0614d4ed9a0b397f2b7fbc65
parentd30d67aad5cc2df8310f5ba2aa6f018994b69fdb
Merge branch 'MDL-25834' of git://github.com/samhemelryk/moodle