[scotch/f21: 4/4] Merge branch 'master' into f21

[Sandro Mani]

commit 7a4b88a3a57cb5880ddbbdf0bede2ae240f7eb68
Merge: 4c2cf03 83fefc6
Author: Sandro Mani <manisandro at gmail.com>
Date:   Sat Mar 14 21:02:00 2015 +0100

    Merge branch 'master' into f21

 .gitignore           |  1 +
 scotch.spec          | 20 +++++++++++++-------
 scotch_esmumps.patch | 18 +++++++++---------
 sources              |  2 +-
 4 files changed, 24 insertions(+), 17 deletions(-)
---