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

[Antonio Trande]

commit a4dba91962dcaa76945d1048e1e199ce2e9298ce
Merge: 90f5369 40aebb6
Author: sagitter <anto.trande at gmail.com>
Date:   Mon Aug 25 20:02:36 2014 +0200

    Merge branch 'master' into el6

 MUMPS.spec |   70 +++++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 51 insertions(+), 19 deletions(-)
---