[calamaris/el6: 10/10] Merge remote branch 'origin/master' into el6

[Robert Scheck]

commit 982d7bf7df2b70351e7aa799a56794b689e8bd40
Merge: d414bc2 55a229a
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sat Aug 3 23:13:51 2013 +0200

    Merge remote branch 'origin/master' into el6

 calamaris-2.59-perl_512.patch |   15 +++++++++++++++
 calamaris.spec                |   27 +++++++++++++++++++++++++--
 2 files changed, 40 insertions(+), 2 deletions(-)
---