On branch master
 Changes to be committed:
	modified:   rem-basel.odd.xml
	modified:   rem-basel.rnc
add r:exp (to replace r:sup)

 HEAD detached from 9ec3610
	modified:   rem-basel.odd.xml
	modified:   rem-basel.rnc
Merge branch 'master' into HEAD

Conflicts:
	rem-basel.odd.xml
	rem-basel.rnc

	modified:   rem-basel.odd.xml
	modified:   rem-basel.rnc
consolidated master/sanktgallen

 On branch sanktgallen
	modified:   rem-basel.odd.xml
minor stuff

 On branch master
	modified:   rem-basel.odd.xml