commit 53eb294d8643275f0e7155cddb0bf740d53994c6 Merge: b30fc2d 26f205b Author: Simone Caronni <negativo17 at gmail.com> Date: Thu Aug 8 16:37:17 2013 +0200 Merge branch 'master' into f18 libtomcrypt.spec | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) ---