Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Fri, 24 Jan 2014 20:34:00 +0000 (21:34 +0100)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Fri, 24 Jan 2014 20:34:00 +0000 (21:34 +0100)
commit173c6e83832b80d88abd78758d6734e4b1c135c0
treeda7e045100f3fde0093501cab3a590affb92def6
parent0147c24bb2eff6dc2dbba4eb0edec84dcc2be942
parent7d845192bccac390e81975569c51010fddab654e
Merge remote-tracking branch 'origin/master'