Merge branch 'MDL-38346_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Mar 2013 23:43:38 +0000 (00:43 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Mar 2013 23:43:38 +0000 (00:43 +0100)
commit8ed6ee97a64c8ebd808c06b095a08c9d973c3a5f
tree12472c7bc64eea62a52d11a30c4dca01a464c435
parente314a6436e4cc2f95266af900e8342a549647e42
parent37652a9cb99ce4535f91e88af6533fb6d84a3687
Merge branch 'MDL-38346_master' of git://github.com/dmonllao/moodle