Tim Nagel 49521e9fc4 Merge branch 'master' into add-hotswapping-aliased-indexes-on-populate ... Conflicts: Resetter.php		2014-03-17 09:18:57 +11:00
..
config	Add support for using aliases to allow hot swapping of indexes when populating	2014-02-06 21:11:12 +00:00
meta	Update LICENSE	2013-09-15 09:17:13 +02:00
public/images	add data collector for client class	2011-10-04 17:01:38 +02:00
views/Collector	added query string to collector and updated tests	2014-02-05 11:58:13 -06:00