Merge remote-tracking branch 'github/master'
authorFlorian Forster <octo@verplant.org>
Tue, 5 Jun 2012 15:05:34 +0000 (17:05 +0200)
committerFlorian Forster <octo@verplant.org>
Tue, 5 Jun 2012 15:05:34 +0000 (17:05 +0200)
1  2 
share/collection.js

Simple merge