Merge branch 'MDL-38404-m' of https://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Mar 2013 22:06:46 +0000 (23:06 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Mar 2013 22:06:46 +0000 (23:06 +0100)
commit59549129b1d8fb0876afa4843f5f012428aec89c
treeca47076b34ecc07b0ee612908f9aa465e41e94b5
parentf3804a0c00f46bf330be50fb02531f9c15a268b2
parent21db4396ab32256dc47673195c1a56f6dd92fe1c
Merge branch 'MDL-38404-m' of https://github.com/andrewnicols/moodle