Merge branch 'MDL-25552_master' of git://github.com/markn86/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 20 Nov 2012 20:00:35 +0000 (09:00 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 20 Nov 2012 20:00:35 +0000 (09:00 +1300)
commitd540132fb57f9df26f9c600aacb0b5d110a0a1cf
tree14e5ed64c19b7765b85b4d7ab85b84fff8fa4376
parent40b9c0694c22cec01145bb7b19ccae6bf7a3e319
parent684c3be721cd2fb8d259315189f7401f1f249e26
Merge branch 'MDL-25552_master' of git://github.com/markn86/moodle