Matthew Exon 4fcd882f02 Merge remote-tracking branch 'upstream/master' into retriever ...

Conflicts:
	retriever/view/help.tpl

2013-05-06 09:50:03 +08:00

..

extract.tpl

update addons template dir layout

2013-04-23 08:48:19 -04:00

help.tpl

Merge remote-tracking branch 'upstream/master' into retriever

2013-05-06 09:50:03 +08:00

rule-config.tpl

update addons template dir layout

2013-04-23 08:48:19 -04:00

settings.tpl

update addons template dir layout

2013-04-23 08:48:19 -04:00