Merge remote-tracking branch 'origin/master' into 2042-new-collection-from-selected...
authorPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 7 Mar 2014 18:43:01 +0000 (13:43 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 7 Mar 2014 18:43:01 +0000 (13:43 -0500)
commit26114a84293ea3fbcc5ef4adcf7900060716e62c
treec6f352ebf2daa083fcc17862eda55e8262655643
parent5420797c32e73347a79b5ecd8cdfbd212fd8aae8
parentdc97d8812b5f793c50e15b60fae66464690b9b41
Merge remote-tracking branch 'origin/master' into 2042-new-collection-from-selected-files