Merge branch 'master' into prettysimple prettysimple
authorJason Skomorowski <jason@indexdata.com>
Tue, 4 Nov 2014 17:16:28 +0000 (12:16 -0500)
committerJason Skomorowski <jason@indexdata.com>
Tue, 4 Nov 2014 17:16:28 +0000 (12:16 -0500)
commit5fce8c968981efbd7fc063faa833f7d8093dd630
tree549463d06b33ed27943e11eda60b5945e8086efd
parent4cd2b3de24d03395424d3f6fc58fe9dbaa87c22d
parent7b8f519897c9b6ac4da2b83080ecd0fb6127b802
Merge branch 'master' into prettysimple

Conflicts:
src/templates/facets.handlebars
test/spec/mkws-pazpar2.js