[dev] [commits] Horde branch imp_6_1 updated. a1912abd11d5ad196b9d51428d775786af8d78f8

[Michael M Slusarz]

Quoting "Michael J. Rubinsky" <mrubinsk at horde.org>:

> commit 8d3d85a312c97e6c75ff3833c6baf7bd9bda1546
> Author: Michael J Rubinsky <mrubinsk at horde.org>
> Date:   Wed Mar 20 10:48:01 2013 -0400
>
>     Fix bad merge.
>
>  imp/package.xml |   73  
> ++++++++++++++++++++++++++++++++++++++++++++++++-------
>  1 files changed, 64 insertions(+), 9 deletions(-)
>
> http://git.horde.org/horde-git/-/commit/8d3d85a312c97e6c75ff3833c6baf7bd9bda1546

This is incorrect.  We explicitly don't have changelog information for  
the new 6.1.0 release in package.xml to decrease the number of  
conflicts when merging from master.

michael

___________________________________
Michael Slusarz [slusarz at horde.org]