[kawa/f20: 3/3] Merge branch 'master' into f20

[Mosaab Alzoubi]

commit 55edb72d002249ab89b22bd3912b652562ec3c54
Merge: a01b813 934d214
Author: Mosaab Alzoubi <moceap at hotmail.com>
Date:   Sat Feb 21 16:24:18 2015 +0300

    Merge branch 'master' into f20

 .gitignore |  1 +
 kawa.spec  | 17 ++++++++++++++---
 sources    |  2 +-
 3 files changed, 16 insertions(+), 4 deletions(-)
---