[xsom] 01/01: Merge branch 'upstream'

[Timo Aaltonen]

This is an automated email from the git hooks/post-receive script.

tjaalton-guest pushed a commit to branch master
in repository xsom.

commit d7733cdc5a1d29df90a42b48a41a883cec802578
Merge: 8bffe49 dfc6a6f
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Fri Dec 13 23:48:30 2013 +0200

    Merge branch 'upstream'

 .classpath                            |  9 +++++
 .project                              | 65 +++++++++++++++++++++++++++++++++++
 .settings/org.eclipse.jdt.core.prefs  |  6 ++++
 .settings/org.maven.ide.eclipse.prefs |  9 +++++
 4 files changed, 89 insertions(+)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/xsom.git