[edje/f19: 2/2] Merge branch 'master' into f19

[Dan Mashal]

commit 8ecaa7e038b3bb252c21bdf125970b3d107de0ca
Merge: 8cf0294 833232f
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Thu Nov 7 22:42:53 2013 -0800

    Merge branch 'master' into f19

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