Official Moodle git projects - moodle.git/commit

Merge branch 'MDL-36621-master' of git://github.com/ankitagarwal/moodle

Conflicts:
calendar/lib.php
lib/db/caches.php
version.php

admin/settings/appearance.php	diff1 \|	diff2 \|	blob \| history
calendar/lib.php	diff1 \|	diff2 \|	blob \| history
calendar/renderer.php	diff1 \|	diff2 \|	blob \| history
lang/en/admin.php	diff1 \|	diff2 \|	blob \| history
lang/en/calendar.php	diff1 \|	diff2 \|	blob \| history
lib/db/caches.php	diff1 \|	diff2 \|	blob \| history
version.php	diff1 \|	diff2 \|	blob \| history

Moodle official production repository

admin/settings/appearance.php	diff1 \|	diff2 \|	blob \| history
calendar/lib.php	diff1 \|	diff2 \|	blob \| history
calendar/renderer.php	diff1 \|	diff2 \|	blob \| history
lang/en/admin.php	diff1 \|	diff2 \|	blob \| history
lang/en/calendar.php	diff1 \|	diff2 \|	blob \| history
lib/db/caches.php	diff1 \|	diff2 \|	blob \| history
version.php	diff1 \|	diff2 \|	blob \| history