[commits] Horde branch imp_6_2 updated. ece62ef39c5eb229b8b08a35f23ca1c0292c9d36

[Michael M Slusarz]

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

from: 551aa6ce3d3e6d5e33b41c2ea98da33d6b4c7b83

c02e1a9 Fix positioning
0f82e4d Remove unneeded status() call
ece62ef Merge branch 'master' into imp_6_2

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

commit c02e1a99313b589eb08e4135d2380425cdc2a927
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Sep 17 22:37:17 2013 -0600

    Fix positioning

 imp/themes/default/screen.css |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

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

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

commit 0f82e4d4ee5c34f5ad4e73e42b901b3b4d66e1d6
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Sep 18 16:24:21 2013 -0600

    Remove unneeded status() call

 imp/lib/Mbox/Generate.php |   13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)

http://git.horde.org/horde-git/-/commit/0f82e4d4ee5c34f5ad4e73e42b901b3b4d66e1d6

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

commit ece62ef39c5eb229b8b08a35f23ca1c0292c9d36
Merge: 551aa6c 0f82e4d
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Sep 18 16:27:41 2013 -0600

    Merge branch 'master' into imp_6_2
    
    Conflicts:
    	imp/lib/Mbox/Generate.php

 imp/lib/Mbox/Generate.php     |   13 ++++---------
 imp/themes/default/screen.css |    1 +
 2 files changed, 5 insertions(+), 9 deletions(-)

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