Merge remote-tracking branch 'origin/master'

author Roman Shevchenko <roman.shevchenko@jetbrains.com>

Mon, 19 Sep 2016 08:28:57 +0000 (11:28 +0300)

committer Roman Shevchenko <roman.shevchenko@jetbrains.com>

Mon, 19 Sep 2016 08:28:57 +0000 (11:28 +0300)
author Roman Shevchenko <roman.shevchenko@jetbrains.com>
Mon, 19 Sep 2016 08:28:57 +0000 (11:28 +0300)
committer Roman Shevchenko <roman.shevchenko@jetbrains.com>
Mon, 19 Sep 2016 08:28:57 +0000 (11:28 +0300)
diff --cc jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java
Simple merge
diff --cc jps/model-impl/src/org/jetbrains/jps/model/java/impl/JavaModuleIndexImpl.java
Simple merge
author	Roman Shevchenko <roman.shevchenko@jetbrains.com>
	Mon, 19 Sep 2016 08:28:57 +0000 (11:28 +0300)
committer	Roman Shevchenko <roman.shevchenko@jetbrains.com>
	Mon, 19 Sep 2016 08:28:57 +0000 (11:28 +0300)
		1	2
jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java	patch \|	diff1 \|	diff2 \|	blob \| history
jps/model-impl/src/org/jetbrains/jps/model/java/impl/JavaModuleIndexImpl.java	patch \|	diff1 \|	diff2 \|	blob \| history