[ldapvi/el6: 6/6] Merge branch 'master' into el6

[Matej Cepl]

commit 7c805aed2e8fd4795e483e4c892d6934463ec1c6
Merge: 6bc8b0c fadad00
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Wed Sep 11 23:34:21 2013 +0200

    Merge branch 'master' into el6

 ldapvi-1.7-fix-use-after-free-in-sasl-code.patch |   41 +++
 ldapvi-1.7-incorrect-FSF-address.patch           |  318 ++++++++++++++++++++++
 ldapvi.spec                                      |   27 ++-
 3 files changed, 385 insertions(+), 1 deletions(-)
---