[commits] Horde branch master updated. 2cbae23329f0c911b40db66488f5c9d1ee8b062e

[Michael J. Rubinsky]

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

from: 669aba8dbcf9a6a5b3797933021367c5e754d9ba

ad68a0c Remove unused, empty file.
4e29b3d Released ansel-2.0.2
2cbae23 Missed change log from FW_4

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

commit ad68a0ce3faff180942b11dbc0709f63a161567b
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Sep 24 11:03:51 2012 -0400

    Remove unused, empty file.

 kronolith/package.xml                           |    8 +++-----
 kronolith/templates/resources/resource-form.php |    1 -
 2 files changed, 3 insertions(+), 6 deletions(-)
 delete mode 100644 kronolith/templates/resources/resource-form.php

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

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

commit 4e29b3dd0a2db0cfa4f7c7f9332c73a05b727c2a
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Sep 24 10:03:22 2012 -0400

    Released ansel-2.0.2
    
    Conflicts:
    	ansel/docs/CHANGES
    	ansel/lib/Application.php
    	ansel/package.xml

 ansel/docs/CHANGES |    8 ++++----
 ansel/package.xml  |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

http://git.horde.org/horde-git/-/commit/4e29b3dd0a2db0cfa4f7c7f9332c73a05b727c2a

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

commit 2cbae23329f0c911b40db66488f5c9d1ee8b062e
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Sep 24 11:12:47 2012 -0400

    Missed change log from FW_4

 ansel/docs/CHANGES |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/2cbae23329f0c911b40db66488f5c9d1ee8b062e