Merge branch 'w15_MDL-26805_m20_userpol' of git://github.com/skodak/moodle into MOODL...
commit71f2316fe6230f8a5b98effbe66205b5462df9a8
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Apr 2011 13:18:31 +0000 (11 15:18 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Apr 2011 13:18:31 +0000 (11 15:18 +0200)
tree790c6e69639a1bbaf32c2f841dc60def8b134439
parent16d610019a8bd92c47fd7cb5477a5bc9e0027772
parent7ca448fa8324c6732837dafc3dcd03a5455d9723
Merge branch 'w15_MDL-26805_m20_userpol' of git://github.com/skodak/moodle into MOODLE_20_STABLE