Merge branch 'master' of https://github.com/gastaldi/catch into gasta…

…ldi-master
seam · Mar 25, 2011 · 7fbb7f8 · 7fbb7f8
2 parents 3211e41 + 84ac583
commit 7fbb7f8
Showing 1 changed file with 0 additions and 0 deletions.
diff --git a/...mple/basic/servlet/messages_en.properties → ...example/basic/servlet/messages.properties b/...mple/basic/servlet/messages_en.properties → ...example/basic/servlet/messages.properties