[commits] Horde branch imp_6_2 updated. e7b1b64e94be851f5b8dc95ee745c151089aef23

[Michael M Slusarz]

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

from: 5423bea8eeac58237331b80595b22e0c11e8ec09

356884a Actually pass the parameter to the method
e7b1b64 Merge branch 'master' into imp_6_2

Summary: http://github.com/horde/horde/compare/5423bea8eeac58237331b80595b22e0c11e8ec09...e7b1b64e94be851f5b8dc95ee745c151089aef23

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

commit 356884ae3c1a3aee7d2a56f2151a80bf4d66fb11
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Nov 12 13:57:16 2013 -0700

    Actually pass the parameter to the method

 framework/Crypt/lib/Horde/Crypt/Pgp.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/356884ae3c1a3aee7d2a56f2151a80bf4d66fb11
http://git.horde.org/horde-git/-/commit/356884ae3c1a3aee7d2a56f2151a80bf4d66fb11

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

commit e7b1b64e94be851f5b8dc95ee745c151089aef23
Merge: 5423bea 356884a
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Nov 12 13:59:15 2013 -0700

    Merge branch 'master' into imp_6_2

 framework/Crypt/lib/Horde/Crypt/Pgp.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/e7b1b64e94be851f5b8dc95ee745c151089aef23
http://git.horde.org/horde-git/-/commit/e7b1b64e94be851f5b8dc95ee745c151089aef23