[commits] Horde branch master updated. f083713a3032d180f149ce4522890f0447aeb152

[Jan Schneider]

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

from: 186826b1ed4ea07d4975bcb58991febaef62107a

f083713 Make sure that default values from IMP prefs are added to any identities created by Horde.

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

commit f083713a3032d180f149ce4522890f0447aeb152
Author: Jan Schneider <jan at horde.org>
Date:   Thu Feb 23 19:32:23 2012 +0100

    Make sure that default values from IMP prefs are added to any identities created by Horde.
    
    Conflicts:
    
    	imp/lib/Prefs/Identity.php

 imp/lib/Prefs/Identity.php |   32 +++++++++++++++++++++++---------
 1 files changed, 23 insertions(+), 9 deletions(-)

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