[libtomcrypt/el6: 2/2] Merge branch 'master' into el6

[Simone Caronni]

commit 1bf2d3552062e403cb66da34b4b6456bbe3ccc92
Merge: 8dfe487 28d3b3d
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Sun Sep 29 14:05:52 2013 +0200

    Merge branch 'master' into el6

 libtomcrypt-pkgconfig.patch |    2 +-
 libtomcrypt.spec            |   23 ++++++++++++-----------
 2 files changed, 13 insertions(+), 12 deletions(-)
---