update from kolab 3.1 to 3.3

[Toke Høiland-Jørgensen]

"Daniel Hoffend" <dh at dotlan.net> writes:

> @Toke:
> If you can resend your pull requests that would be great.

Resubmitted. :)

-Toke
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 472 bytes
Desc: not available
URL: <http://lists.kolab.org/pipermail/users/attachments/20140929/2e5c1664/attachment.sig>