Merge branch 'full' of git://github.com/kevinjardine/Elgg-Event-Calendar

author Sem <sembrestels@riseup.net>

Fri, 23 Nov 2012 00:05:31 +0000 (01:05 +0100)

committer Sem <sembrestels@riseup.net>

Fri, 23 Nov 2012 00:05:31 +0000 (01:05 +0100)
author Sem <sembrestels@riseup.net>
Fri, 23 Nov 2012 00:05:31 +0000 (01:05 +0100)
committer Sem <sembrestels@riseup.net>
Fri, 23 Nov 2012 00:05:31 +0000 (01:05 +0100)
diff --cc languages/en.php
Simple merge
diff --cc models/model.php
Simple merge
diff --cc start.php
Simple merge
diff --cc views/default/forms/event_calendar/edit.php
Simple merge
author	Sem <sembrestels@riseup.net>
	Fri, 23 Nov 2012 00:05:31 +0000 (01:05 +0100)
committer	Sem <sembrestels@riseup.net>
	Fri, 23 Nov 2012 00:05:31 +0000 (01:05 +0100)
		1	2
languages/en.php	patch \|	diff1 \|	diff2 \|	blob \| history
models/model.php	patch \|	diff1 \|	diff2 \|	blob \| history
start.php	patch \|	diff1 \|	diff2 \|	blob \| history
views/default/forms/event_calendar/edit.php	patch \|	diff1 \|	diff2 \|	blob \| history