[commits] Horde branch master updated. 95b5e703456f7563d9ae4307e675c51c8506f378

[Michael J. Rubinsky]

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

from: 7cad441d80052d72e9bb454b2419f5faa039c329

ae5627a Revert "CHANGES"
95b5e70 CHANGES/BFN

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

commit ae5627a4d5e9681ab29ec593d7e97bd01b4d525c
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri Sep 28 21:08:03 2012 -0400

    Revert "CHANGES"
    
    This reverts commit 7cad441d80052d72e9bb454b2419f5faa039c329.

 kronolith/docs/CHANGES |    2 --
 kronolith/package.xml  |    2 --
 2 files changed, 0 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/ae5627a4d5e9681ab29ec593d7e97bd01b4d525c

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

commit 95b5e703456f7563d9ae4307e675c51c8506f378
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri Sep 28 21:07:07 2012 -0400

    CHANGES/BFN
    
    Conflicts:
    	kronolith/package.xml

 kronolith/docs/CHANGES |    2 ++
 kronolith/package.xml  |    3 ++-
 2 files changed, 4 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/95b5e703456f7563d9ae4307e675c51c8506f378