Merge branch 'master' of github.com:DAViCal/davical into githubmaster
commitcd343bd9f20c473ee507060035b1b87b5d9afee7
authorAndrew McMillan <andrew@morphoss.com>
Thu, 24 Oct 2013 23:20:44 +0000 (25 12:20 +1300)
committerAndrew McMillan <andrew@morphoss.com>
Thu, 24 Oct 2013 23:20:44 +0000 (25 12:20 +1300)
treedfa4611c1f076d7bd2c66ee0033fd8c3c2c3867d
parentc2b6be3b65ca94a742045577856a14f37b94b870
parentad4e6f1a0b6306b141564c6132f54e3a6cb4054e
Merge branch 'master' of github.com:DAViCal/davical into github