Merge branch 'MDL-38815_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Apr 2013 17:48:02 +0000 (19:48 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Apr 2013 17:48:02 +0000 (19:48 +0200)
commit2a5e0d6321a8f4c5b9363d4410f3369126dc92a2
tree88147f430ac4b4797f8abde32ec90160cc8b92b7
parent7191a59fc9d5e8f66511648edc501bbd60a68f8a
parent693969b5c18110d67a93a8125268e6f1ade5aef7
Merge branch 'MDL-38815_master' of git://github.com/dmonllao/moodle