commit a994b3a0e57d0d5c99768c2bdd6c84cc9b55fa88
Merge: 52a7ad1 5cb802a
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Jun 5 14:39:52 2012 +0200
Merge branch 'master' into f17
Conflicts:
velocity.spec
0002-Fix-servlet25-testcase.patch | 64 -------------------------------------
velocity.spec | 40 ++++++++---------------
2 files changed, 14 insertions(+), 90 deletions(-)
---
Show replies by date