[redeclipse/f19: 23/23] Merge branch 'master' into f19

[Martin Erik Werner]

commit 77756484998d1c1b4c4c6f48d013c99fd02531b2
Merge: 62003ae 76c8e95
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date:   Thu May 2 10:44:05 2013 +0200

    Merge branch 'master' into f19

 redeclipse.spec |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)
---