Merge branch 'wip-MDL-26959-master' of git://github.com/phalacee/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Apr 2012 01:20:23 +0000 (03:20 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Apr 2012 01:20:23 +0000 (03:20 +0200)
commit344c07c3de449537b94df69b856d777d6a649291
tree2e216302a441edf54b8601148b8665d8c4e59e8e
parent2360f60fd8293c102f74c0a2e993028a4351750e
parentf77f2406fe22798a792cc3189a1ec7dfb7a62294
Merge branch 'wip-MDL-26959-master' of git://github.com/phalacee/moodle