Merge remote-tracking branch 'origin/master' into mikhail.golubev/configurable-issues...
authorMikhail Golubev <mikhail.golubev@jetbrains.com>
Thu, 12 Feb 2015 15:56:16 +0000 (18:56 +0300)
committerMikhail Golubev <mikhail.golubev@jetbrains.com>
Thu, 12 Feb 2015 15:56:16 +0000 (18:56 +0300)
commit41805e40f2afcfdb4a60882b8066f531e443c6d2
tree1e4cc5626ca2b12153556cc817e8f64548272b3b
parent91beb1c0e3f2f5c909f28920b1dd8253554eb24b
parent601500c2989346d4cde416e94f7e4ca0c1a54bde
Merge remote-tracking branch 'origin/master' into mikhail.golubev/configurable-issues-states
plugins/tasks/tasks-core/src/com/intellij/tasks/actions/OpenTaskDialog.java
plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskManagerImpl.java
plugins/tasks/tasks-tests/test/com/intellij/tasks/integration/JiraIntegrationTest.java