forgot to fail the test
Merge remote-tracking branch 'origin/master'
Refs #1845, make sure current site host is used in default alias in merge alias option description and in group by domain description.
Fixed 'rec' param value when replay-tracking enabled
Fixed if condition if optoions replay_tracking enabled.
Adding test log entry with &rec=0 , tests still passing so the request is not tracked as expected
Merge remote-tracking branch 'origin/master'
Refs pull request #39 adding failing test prior to merge
Merge pull request #39 from clearcode/master

Make sure "noscript" image request is not recorded when logs are replayed
tracking xlsx, docx and pptx as downloads
Merge branch 'master' of github.com:piwik/piwik
fixed bug: hex() is not a function
Fixing TypeError: visitColor(...).hex is not a function
       http://localhost/piwik-master/plugins/UserCountryMap/js/realtime-map.js?cb=b551318fb4d433a71dbda20229797efc
       Line 205
small refactor
Refs #3343 Displaying the Visitor Log in a popover for better UX
Build
Fixes build?
Fixing build, second attempt
Merge remote-tracking branch 'origin/master'
Fixing build, another attempt...