The following commit has been merged in the master branch:
commit e07109bb25592b5a9063ce8a1dc0343b8107147e
Merge: 58cfd7920f480c5f1051e892be65f3211bd9d0d1
c3badcad689b273f3b98d9c6bb7e6b50448e0560
Author: Jakub Adam <[email protected]>
Date: Tue May 1 12:31:41 2012 +0200
Merge tag 'upstream/8.1.3'
Upstream version 8.1.3
diff --combined .gitignore
index cf31ba2,815d296..0384034
--- a/.gitignore
+++ b/.gitignore
@@@ -12,6 -12,7 +12,6 @@@ target
*.log
*.swp
*.diff
-*.patch
# intellij
*.iml
@@@ -37,3 -38,4 +37,4 @@@
#maven
*.versionsBackup
+ *.releaseBackup
--
jetty8 packaging
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
