[berusky/f18: 5/5] Merge branch 'master' into f18

[Martin Stransky]

commit a2205b09dc0661d61d2980ca1c1bfd5deb86e6da
Merge: dfcf45d f92c639
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Sat Feb 8 15:01:19 2014 +0100

    Merge branch 'master' into f18

 .gitignore   |    1 +
 berusky.png  |  Bin 1598 -> 16068 bytes
 berusky.spec |   47 +++++++++++++++++++++++++----------------------
 sources      |    2 +-
 4 files changed, 27 insertions(+), 23 deletions(-)
---