Merge pull request #2219 from chris5560/master
authorHannu Nyman <hannu.nyman@iki.fi>
Thu, 7 Jan 2016 11:39:23 +0000 (13:39 +0200)
committerHannu Nyman <hannu.nyman@iki.fi>
Thu, 7 Jan 2016 11:39:23 +0000 (13:39 +0200)
[Radicale] upstream to Radicale 1.1


Trivial merge