Cory Schires e2ee248fba Added documentation for ability to set conditions for recording impressions. Also, Had to do some work to get the tests passing ... Merge remote branch 'upstream/master' Conflicts: test_app/Gemfile.lock		2011-11-27 13:39:45 -06:00
..
controllers	fixed typo	2011-11-10 14:14:51 +01:00
models	Move AR include into engine file.	2011-11-04 10:27:13 -05:00