Merge branch 'master_MDL-30211' of git://github.com/danmarsden/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 7 Dec 2011 21:44:47 +0000 (10:44 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 7 Dec 2011 21:44:47 +0000 (10:44 +1300)
commit871c2e15c7876ef2cbd12d111a82f05e01221074
tree13755b937a3ce4945ef7257d4ccb220fbd3cdbce
parentb6965b11fcc25791669023b6b2da65b04fdb084a
parentc72c63568986a7a5b16c9178349a05d8afb30371
Merge branch 'master_MDL-30211' of git://github.com/danmarsden/moodle