Merge branch 'master' of http://git.tine20.org/git/Syncope
authorLars Kneschke <l.kneschke@metaways.de>
Wed, 29 Feb 2012 08:24:44 +0000 (09:24 +0100)
committerLars Kneschke <l.kneschke@metaways.de>
Wed, 29 Feb 2012 08:24:44 +0000 (09:24 +0100)
commitd61daf61f03205fedfad15a7842285230ebd99c9
tree42a2f78313a997b9d15c0cf8e6b64364ec71c04c
parent788ca294e1f4a7d3d206f5bedf2efac320da2353
parentfc4ecaf141bade65bcc96a10d3586ccdd35b3aa8
Merge branch 'master' of git.tine20.org/git/Syncope
tine20/library/Syncope/lib/Syncope/Server.php