Hm, possible conflict
Attempt to solve a conflict

Merge branch 'master' of github.com:AKSW/PanLex-2-RDF

Conflicts:
	paper/2012/SWJ-PanLex/paper.tex
Merge branch 'master' of github.com:AKSW/PanLex-2-RDF