commit 41e4879a11f125d02d3ed53a35dd3bebe7c9efd5
Merge: 1039d9e f0f3577
Author: Minh Ngo <nlminhtl at gmail.com>
Date: Sun Sep 30 14:01:15 2012 +0300
Merge branch 'f17' into f18
Conflicts:
leechcraft.spec
leechcraft.spec | 42 ++++++++++++++++++++++++++++++++++--------
1 files changed, 34 insertions(+), 8 deletions(-)
---