Merge branch 'w15_MDL-32308_m23_sharing' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 9 Apr 2012 22:37:45 +0000 (10:37 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 9 Apr 2012 22:37:45 +0000 (10:37 +1200)
commit756d5f761050c182d523a1e9fbec39c2449653b8
tree55f8efe3c4ae6f2240cd0c15644b81f870f7522d
parentf930cf6b41296267dd627a53c2ef1f3775534f5f
parent5b244e2bb03d4e942c05722f1034547ad6500970
Merge branch 'w15_MDL-32308_m23_sharing' of git://github.com/skodak/moodle