Merge commit 'refs/merge-requests/12' of git://gitorious.org/svn2git/svn2git into...
authorTorgny Nyblom <kde@nyblom.org>
Sun, 8 May 2011 07:19:57 +0000 (09:19 +0200)
committerTorgny Nyblom <kde@nyblom.org>
Sun, 8 May 2011 07:19:57 +0000 (09:19 +0200)
commit4c241d532e2f07c7f1c188cebebb712b752ed1ed
treefe285061d7298746feb06825a767abd3f999ca61
parente8a16c9a47eef7c625686d2a868ec91d05fd95c5
parentc630dd763cf6ec096489bea551ca959540969c94
Merge commit 'refs/merge-requests/12' of git://gitorious.org/svn2git/svn2git into merge-requests/12

Conflicts:
src/ruleparser.cpp
src/ruleparser.cpp
src/ruleparser.h