Merge branch 'MDL-27818_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
commit948835483a2258941d2d6654a0dd00f826aa98ea
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Sep 2012 23:08:07 +0000 (4 01:08 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Sep 2012 23:08:07 +0000 (4 01:08 +0200)
tree93f56188f897f2981d50cedbf73fde265a1d35f8
parent3db989d41ea6949559bb079088e696dcfc787896
parent228533be802bd012391edf8a38c4d7d93bf44b6f
Merge branch 'MDL-27818_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE