Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorNiclas Zimmermann <niclas@kivitendo-premium.de>
Tue, 5 Mar 2013 14:19:07 +0000 (15:19 +0100)
committerNiclas Zimmermann <niclas@kivitendo-premium.de>
Tue, 5 Mar 2013 14:19:07 +0000 (15:19 +0100)
commitf3548f890e3ec8e06d5a03bc76117d3649aa652a
treeffd6461c2b9c33860fa8edeb20a5262b7c397ee4
parent56f7991d4910ae12c7d16aab025a2ab242ca5eeb
parentb2a8017a67e4e151187fecd61366926405035acc
Merge branch 'master' of github.com:kivitendo/kivitendo-erp