Merge branch '3072-empty-collection-bugfix'
authorTim Pierce <twp@curoverse.com>
Mon, 21 Jul 2014 19:35:29 +0000 (15:35 -0400)
committerTim Pierce <twp@curoverse.com>
Mon, 21 Jul 2014 19:35:29 +0000 (15:35 -0400)
closes #3072.

1  2 
services/api/test/fixtures/links.yml

Simple merge