tree fb76b2d4ab712d88d2f8dc5b8138514d0651de93
parent a2a6d987a43ffacd7d40cb72f8b4375e12c6f5b5
parent 4c57aa9f23bdd053fa63e77cb3a3d223b2eb5f6a
author Natalia Ukhorskaya <natalia.ukhorskaya@jetbrains.com> 1392620918 +0400
committer Natalia Ukhorskaya <natalia.ukhorskaya@jetbrains.com> 1392621904 +0400

Merge branch 'master' into android_studio
Conflicts:
   update_dependencies.xml