Arbeitsversionen (*_mw.*) angelegt von doku/wibo_gft_doku_v1.3_(printlayout).odt und htdocs/index.html
Merge branch 'master' of github.com:borste/WiBo_GoogleFusionTables

Conflicts:
	doku/wibo_gft_doku_v1.3_(printlayout).odt
conflicting odt deleted
Merge branch 'master' of github.com:borste/WiBo_GoogleFusionTables
doku/wibo_gft_doku_v1.3_(printlayout)_mw-05022013.odt added
Merge pull request #8 from wisniman/master

Doku Update