Typo
Bug fix fast_select: secondary queries need all joins from dfields; filter sector filter for project time report
Bug fix fast_select: don't include vfltr fields in extract; Fix missing import in s3utils.py
Merge branch 'master' of git://github.com/flavour/eden
Make MembershipVirtualFields lazy
Merge branch 'master' of git://github.com/flavour/eden
DRMP tweaks (inc partial merge Michael), Update Flot to v0.8
Merge branch 'master' of git://github.com/flavour/eden
sync_conflict table deprecated
pr default list_fields & represent for NONE
Make grouped opts widget fit for crud forms, migrate ProjectDRRModel
Fix dt orderby.
Merge branch 'master' of git://github.com/flavour/eden
Merge branch 'master' of git://github.com/flavour/eden
Bug fixes.
Merge branch 'master' of git://github.com/flavour/eden
Merge branch 'master' of git://github.com/flavour/aidiq