Merge branch 'master' into multiroot_branch

author Kirill Likhodedov <Kirill.Likhodedov@gmail.com>

Tue, 17 Jan 2012 17:55:11 +0000 (20:55 +0300)

committer Kirill Likhodedov <Kirill.Likhodedov@gmail.com>

Tue, 17 Jan 2012 17:55:11 +0000 (20:55 +0300)
author Kirill Likhodedov <Kirill.Likhodedov@gmail.com>
Tue, 17 Jan 2012 17:55:11 +0000 (20:55 +0300)
committer Kirill Likhodedov <Kirill.Likhodedov@gmail.com>
Tue, 17 Jan 2012 17:55:11 +0000 (20:55 +0300)
diff --cc platform/platform-impl/src/com/intellij/ui/popup/PopupFactoryImpl.java
Simple merge
diff --cc plugins/git4idea/src/git4idea/merge/GitMergeProvider.java
Simple merge
author	Kirill Likhodedov <Kirill.Likhodedov@gmail.com>
	Tue, 17 Jan 2012 17:55:11 +0000 (20:55 +0300)
committer	Kirill Likhodedov <Kirill.Likhodedov@gmail.com>
	Tue, 17 Jan 2012 17:55:11 +0000 (20:55 +0300)
		1	2
platform/platform-impl/src/com/intellij/ui/popup/PopupFactoryImpl.java	patch \|	diff1 \|	diff2 \|	blob \| history
plugins/git4idea/src/git4idea/merge/GitMergeProvider.java	patch \|	diff1 \|	diff2 \|	blob \| history