sort qids
Merge branch 'master' of github.com:metaborg/lwc2013
lwc.ql/trans/ql.str

Conflicts:
	org.spoofax.lang.lwc.ql/test/example-partial.qls
	org.spoofax.lang.lwc.ql/test/example.ql
	org.spoofax.lang.lwc.ql/trans/dependencies.str
	org.spoofax.lang.lwc.ql/trans/ql.str