[mosh/el5: 2/2] Merge branch 'master' into el5

[Alex Chernyakhovsky]

commit dc6fb9522b8330435a5c4e3b05054e12d27799bc
Merge: f84cec9 06ca53b
Author: Alexander Chernyakhovsky <achernya at mit.edu>
Date:   Wed Jun 13 11:55:54 2012 -0400

    Merge branch 'master' into el5

 .gitignore |    1 +
 mosh.spec  |    7 +++++--
 sources    |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---