Merge branch 'MDL-31316-master-4' of git://git.luns.net.uk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Feb 2012 10:07:55 +0000 (11:07 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Feb 2012 10:07:55 +0000 (11:07 +0100)
commit82b07ee7d39894bc9c7008a941b89a7b58b47bef
treeeb8b72212946cf877ac77f0466269e9a7a99543e
parent90c34a1b3c61fa5aed017b8d41eba9a431bb0db4
parent29b9b464d8b495e163a8379cab491346cf22487d
Merge branch 'MDL-31316-master-4' of git://git.luns.net.uk/moodle