Merge pull request #5823 from bobot/feature/api_parent_ids

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

Mon, 6 Jan 2014 14:15:48 +0000 (06:15 -0800)

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

Mon, 6 Jan 2014 14:15:48 +0000 (06:15 -0800)
author Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Mon, 6 Jan 2014 14:15:48 +0000 (06:15 -0800)
committer Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Mon, 6 Jan 2014 14:15:48 +0000 (06:15 -0800)
diff --cc doc/api/repositories.md
Simple merge
diff --cc lib/api/repositories.rb
Simple merge
author	Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
	Mon, 6 Jan 2014 14:15:48 +0000 (06:15 -0800)
committer	Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
	Mon, 6 Jan 2014 14:15:48 +0000 (06:15 -0800)
		1	2
doc/api/repositories.md	patch \|	diff1 \|	diff2 \|	blob \| history
lib/api/repositories.rb	patch \|	diff1 \|	diff2 \|	blob \| history