Merge remote-tracking branch 'github/master'
authorKirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Wed, 9 Jan 2013 11:28:03 +0000 (15:28 +0400)
committerKirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Wed, 9 Jan 2013 11:28:03 +0000 (15:28 +0400)
commit2bb19572a80ac6d234a9886b1d9eae1f3853bd4d
treee4e7aed77820cd2ffb256539e17b42ca249b1ea2
parent53761fd4e7bd772fb0063df9f9e091ab68945244
parentea26b6cd8189da8f6e8d0418af6cf15f5d1ebcf2
Merge remote-tracking branch 'github/master'

Conflicts:
platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/masterKey/ChangeMasterKeyDialog.java