iparty;S;10;108;-1370868395159;TPC;INSOURCED;OUTSOURCED
Merge branch 'master' of https://github.com/Karatekiwi/lsdc

Conflicts:
	.classpath