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

[Kapil Arya]

commit febda8991fcc8b5979a669b4afad7140fb4f91c8
Merge: f4449d4 414db7f
Author: Kapil Arya <kapil at ccs.neu.edu>
Date:   Mon Aug 12 23:41:02 2013 -0400

    Merge branch 'master' into el6

 dmtcp.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---