[MUMPS/el6: 2/2] Merge branch 'master' into el6

[Antonio Trande]

commit aeee45fe1ecece8801fa736c916b338d418c07be
Merge: 61287b2 7008419
Author: sagitter <sagitter at fedoraproject.org>
Date:   Wed Aug 28 19:23:04 2013 +0200

    Merge branch 'master' into el6

 MUMPS.spec |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)
---