Merge branch 'w23_MDL-39588_m25_ociinstall' of git://github.com/skodak/moodle into...
commit92c46e00eb10fa0ec0c5b5c61aee98bac60716a2
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Jun 2013 14:24:22 +0000 (5 16:24 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Jun 2013 14:24:22 +0000 (5 16:24 +0200)
treee8f6f4988a744e9e5de9a7dce7f6350973f9b6ec
parent1127607bce385db74de59487fb24668dbbe800ea
parentdd85f5aed0b846e8de7209dc548e52080514ab60
Merge branch 'w23_MDL-39588_m25_ociinstall' of git://github.com/skodak/moodle into MOODLE_25_STABLE