Merge remote-tracking branch 'origin/master' appcode/138.1031 cppide/138.1032 idea/138.1037 idea/138.1038 phpstorm/138.1034 pycharm/138.1039 rubymine/138.1033 webstorm/138.1035
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 8 Jul 2014 19:54:13 +0000 (21:54 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 8 Jul 2014 19:54:13 +0000 (21:54 +0200)
commit0e8564a197eb4584a1df56670bb7ed2a47be8da2
tree868e6973fd33e7b03b0240eecdf607022115d44a
parentc3e78ad7221dd56663c4fab72145506ae6a31acc
parent54474d05561e2aaab281ee928f7eaf6e14dcc3bd
Merge remote-tracking branch 'origin/master'