Merge branch 'master' of git+ssh://repo.or.cz/srv/git/davical
commit9540e01cd4bcf5b3f461757c5820581dac2d246a
authorAndrew McMillan <andrew@morphoss.com>
Tue, 31 Jan 2012 17:44:41 +0000 (31 09:44 -0800)
committerAndrew McMillan <andrew@morphoss.com>
Tue, 31 Jan 2012 17:44:41 +0000 (31 09:44 -0800)
tree77f0ee94940a0c5f2a14795dcc889b2cb397920c
parente9e5073eb5868f303ceb65e0f2c463f14eb62f2b
parent170bb90d09323854b8a8839e2628a09ba20d03a0
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/davical