812bb9b Rebase to latest upstream & Fix problems from bz#226525

Authored and Committed by Stanislav Ochotnicky 13 years ago
    Rebase to latest upstream & Fix problems from bz#226525
    
        
file modified
+1 -0
file modified
+1 -1
velocity-1.6.4.pom velocity-1.6.3.pom
file renamed
+4 -8
file modified
+12 -5
file modified
+37 -26