3e826e603e9737e4af9d0913cd08e98ca310f1ad	not-for-merge	tag '0.8.4' of git://gitorious.org/resistance/resistance
