From: liana.bakradze <liana.bakradze@jetbrains.com>
Date: Mon, 19 Sep 2016 13:04:48 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/liana/edu-tests'
X-Git-Tag: dbe/163.4790~5
X-Git-Url: http://git.jetbrains.org/?p=idea%2Fcommunity.git;a=commitdiff_plain;h=d1b44d32960cf7bf1a7cdd3678bacbe865c62112

Merge remote-tracking branch 'origin/liana/edu-tests'

# Conflicts:
#	python/educational-core/student/src/com/jetbrains/edu/learning/ui/CCCreateAnswerPlaceholderPanel.java
---

d1b44d32960cf7bf1a7cdd3678bacbe865c62112