Merge branch 'w51_MDL-37281_m25_othersnav' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 7 Jan 2013 00:35:25 +0000 (13:35 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 7 Jan 2013 00:35:25 +0000 (13:35 +1300)
commit68ed412599d933c3d30ef478801b16b80ce135f3
treebfe6e74b69f856658cca217cf6c8352a3af0dce6
parent5fc4ac8549c3c79cf43d98b625970c35fca37ced
parenta1b5490ac4975543a93f19423c8b605f2fb3ea70
Merge branch 'w51_MDL-37281_m25_othersnav' of git://github.com/skodak/moodle