[commits] Horde branch master updated. 83ad28a10a200be2c59cc6cfd886f75a16c13418

[Jan Schneider]

The branch "master" has been updated.
The following is a summary of the commits.

from: 502d80a8dfb0898bccf45c3cde122f9884762640

83ad28a BFN

Summary: http://github.com/horde/horde/compare/502d80a8dfb0898bccf45c3cde122f9884762640...83ad28a10a200be2c59cc6cfd886f75a16c13418

-----------------------------------------------------------------------

commit 83ad28a10a200be2c59cc6cfd886f75a16c13418
Author: Jan Schneider <jan at horde.org>
Date:   Fri Aug 29 14:02:57 2014 +0200

    BFN
    
    Conflicts:
    	turba/docs/CHANGES
    	turba/package.xml

 turba/docs/CHANGES |    9 ---------
 turba/package.xml  |   18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 9 deletions(-)

http://github.com/horde/horde/commit/83ad28a10a200be2c59cc6cfd886f75a16c13418