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

[Benjamin Drung]

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

bdrung pushed a commit to branch master
in repository xsom.

commit fd60e560190ebc297a42d660ac42bb19d4ae86ce
Merge: e612a0e aef6503
Author: Benjamin Drung <benjamin.drung at profitbricks.com>
Date:   Mon May 19 14:18:41 2014 +0200

    Merge branch 'upstream'

 lib/copying-relaxngDatatype.txt | 30 ------------------------------
 lib/copying-thaiOpensource.txt  | 31 -------------------------------
 2 files changed, 61 deletions(-)

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