Merge branch 'tine20.com/2012.10' into 2013.03
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 17 Apr 2013 14:05:14 +0000 (16:05 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 17 Apr 2013 14:05:14 +0000 (16:05 +0200)
1  2 
tine20/Calendar/Backend/Sql.php
tine20/Tinebase/Frontend/Cli.php
tine20/Tinebase/Record/RecordSet.php

Simple merge
Simple merge
Simple merge