Merge branch 'master' of http://git.tine20.org/git/Syncope
authorCornelius Weiß <mail@corneliusweiss.de>
Fri, 27 Jan 2012 09:22:35 +0000 (10:22 +0100)
committerCornelius Weiß <mail@corneliusweiss.de>
Fri, 27 Jan 2012 09:22:35 +0000 (10:22 +0100)
commit2af6d04d25c8398b652217b67295c1c987e83e36
tree65262f219835f4174a3eb28481b97fd9746ca904
parent70949ed88145ccd7d6cb9f215a14cbeadb3e2550
parenteee4760d9c0041021138ae118a05b71d7439c5da
Merge branch 'master' of git.tine20.org/git/Syncope