init1
qe
pois
Merge branch 'master' of github.com:tjvirtan/repo

Conflicts:
	cartridges/int_gc_core/cartridge/documentation/jsdoc_ant/jsdoc3-ant-task-master/lib/jsdoc3/test/cases/src/_dir2/four.js
	cartridges/int_gc_core/cartridge/documentation/jsdoc_ant/jsdoc3-ant-task-master/lib/jsdoc3/test/cases/src/_ignored.js
	cartridges/int_gc_core/cartridge/documentation/jsdoc_ant/jsdoc3-ant-task-master/lib/jsdoc3/test/cases/src/dir1/.svn/text-base/three.js.svn-base
	cartridges/int_gc_core/cartridge/documentation/jsdoc_ant/jsdoc3-ant-task-master/lib/jsdoc3/test/cases/src/dir1/three.js
	cartridges/int_gc_core/cartridge/documentation/jsdoc_ant/jsdoc3-ant-task-master/lib/jsdoc3/test/cases/src/ignored.txt
	cartridges/int_gc_core/cartridge/documentation/jsdoc_ant/jsdoc3-ant-task-master/lib/jsdoc3/test/cases/src/one.js
	cartridges/int_gc_core/cartridge/documentation/jsdoc_ant/jsdoc3-ant-task-master/lib/jsdoc3/test/cases/src/two.js
joo