Merge branch 'MDL-33331-master' of git://github.com/micaherne/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 28 May 2012 02:52:47 +0000 (14:52 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 28 May 2012 02:52:47 +0000 (14:52 +1200)
commit681789b4c192f8dadecf72f208c8ad14d0534fd6
treef1d7e629e693272eb060c3f2025d2ae9c2df8779
parentbb0eaec4907f92215e6b5005b81c74a52767cf67
parent7dfe4b92d0da0362449c3412375b752e65c80dff
Merge branch 'MDL-33331-master' of git://github.com/micaherne/moodle