tree dcc7f83ca5e00c31a329e4f2107dc8b898438c82
parent 0c4d0bf0f01b252967fb8f79d946642901d80b92
parent f414f0cab6573e1ac54d489af20327c1c91094e7
author Vincent Driessen <vincent@3rdcloud.com> 1341836646 +0200
committer Vincent Driessen <vincent@3rdcloud.com> 1341836646 +0200

Merge branch 'develop' into squash-option