Merge branch 'upsource-master' of git.labs.intellij.net:idea/community into upsource...
authorDmitry Lomov <dmitry.lomov@jetbrains.com>
Mon, 19 Nov 2012 08:31:55 +0000 (09:31 +0100)
committerDmitry Lomov <dmitry.lomov@jetbrains.com>
Mon, 19 Nov 2012 08:31:55 +0000 (09:31 +0100)
commitc15ead7ee96cb44c96c01167b44bb6eb56d016cf
tree12e04775b75dd3d5423b68e3f6c68e3d9ee324bf
parent6d2a815e0dec179823790c6bb15114a121237966
parent39c044c10741d20756bc371f81c0720395cb4b4f
Merge branch 'upsource-master' of git.labs.intellij.net:idea/community into upsource-master