summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Arendsen Hein <thomas@intevation.de>2010-10-11 08:52:49 (GMT)
committerThomas Arendsen Hein <thomas@intevation.de>2010-10-11 08:52:49 (GMT)
commita6508f5b61573d27cc913b075202dc3a2ccf838d (patch)
treeeaef5807e15049629c1f086c01d4f6914892f3fc
parent4d27c82022cdff81b08f05c08ea9a2199da2b9a6 (diff)
parent201710f665278a0c14cdbca70cff418c04c7be34 (diff)
downloadkolab-server-a6508f5b61573d27cc913b075202dc3a2ccf838d.tar.gz
Dummy merge: Mark 2.2-stable as merged into default up to point of migration
Development in the Mercurial repository started after b291c29ca994 (for default) and 82733a4020a0 (for 2.2-stable). There are still some changesets in the 2.2-stable branch that need to be ported to default, this can be determined by comparing release-notes.txt.
0 files changed, 0 insertions, 0 deletions