Merge branch 'master' into 6-0-dev

author Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Fri, 12 Jul 2013 11:42:35 +0000 (14:42 +0300)

committer Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Fri, 12 Jul 2013 11:42:35 +0000 (14:42 +0300)
author Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Fri, 12 Jul 2013 11:42:35 +0000 (14:42 +0300)
committer Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Fri, 12 Jul 2013 11:42:35 +0000 (14:42 +0300)
diff --cc CHANGELOG
Simple merge
diff --cc app/models/key.rb
Simple merge
diff --cc app/models/project.rb
Simple merge
diff --cc app/views/projects/issues/_issue.html.haml
Simple merge
diff --cc lib/api/entities.rb
Simple merge
author	Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
	Fri, 12 Jul 2013 11:42:35 +0000 (14:42 +0300)
committer	Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
	Fri, 12 Jul 2013 11:42:35 +0000 (14:42 +0300)
		1	2
CHANGELOG	patch \|	diff1 \|	diff2 \|	blob \| history
app/models/key.rb	patch \|	diff1 \|	diff2 \|	blob \| history
app/models/project.rb	patch \|	diff1 \|	diff2 \|	blob \| history
app/views/projects/issues/_issue.html.haml	patch \|	diff1 \|	diff2 \|	blob \| history
lib/api/entities.rb	patch \|	diff1 \|	diff2 \|	blob \| history