Kohsuke Kawaguchi 40ffd566a2 Merge branch 'rc' ...

Conflicts:
	war/pom.xml

2011-06-17 22:12:34 -07:00

..

src

Merge branch 'rc'

2011-06-17 22:12:34 -07:00

pom.xml

cleaning up the copyright/license information in POM and source code for Ubuntu packaging

2011-06-17 08:22:18 -07:00