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

[Miro Hrončok]

commit f8802841beb350340759ee8ee2d33372934cdb5c
Merge: b8e44b8 4d7e017
Author: Miro Hrončok <miro at hroncok.cz>
Date:   Fri Jan 3 11:27:05 2014 +0100

    Merge branch 'master' into f19

 ino.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---