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

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

2013-01-22 16:35:03 +13:00

..

afterburner

…

anomaly

…

arialist

…

base

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

2013-01-22 16:35:03 +13:00

binarius

…

boxxie

…

brick

…

canvas

…

formal_white

Merge branch 'MDL-36553' of git://github.com/rwijaya/moodle

2013-01-15 18:12:20 +01:00

formfactor

…

fusion

…

leatherbound

…

magazine

Merge branch 'wip-MDL-36339-master' of git://github.com/marinaglancy/moodle

2012-12-18 21:36:42 +01:00

mymobile

…

nimble

…

nonzero

…

overlay

…

serenity

…

sky_high

Merge branch 'wip-MDL-36339-master' of git://github.com/marinaglancy/moodle

2012-12-18 21:36:42 +01:00

splash

…

standard

Merge branch 'MDL-36553' of git://github.com/rwijaya/moodle

2013-01-15 18:12:20 +01:00

standardold

Merge branch 'wip-MDL-36339-master' of git://github.com/marinaglancy/moodle

2012-12-18 21:36:42 +01:00

image.php

…

index.php

…

javascript.php

…

styles_debug.php

…

styles.php

…

switchdevice.php

…

upgrade.txt

…

yui_combo.php

…

yui_image.php

…