tree a65f0fea9b1d4e71f6f2c79ce0f11d994fc6afa2
parent 1e03787f6b400e06eab9cd24bd3df96213eb0d38
parent b19ba959027c5a3c4f59286fc6740e91ccc1bfa1
author Jake Biesinger <jake.biesinger@gmail.com> 1377211579 -0700
committer Jake Biesinger <jake.biesinger@gmail.com> 1377211579 -0700

Merge branch 'anbangx/backupMergingWithMaster' into genomix/fullstack_genomix

Conflicts:
	genomix/genomix-pregelix/src/test/java/edu/uci/ics/genomix/pregelix/JobGen/JobGenerator.java
	genomix/genomix-pregelix/src/test/java/edu/uci/ics/genomix/pregelix/JobRun/PathMergeTestSuite.java
	genomix/genomix-pregelix/src/test/resources/jobs/P4ForMergeGraph.xml