merge in lmp-mr1-release history after reset to lmp-mr1-dev
diff --git a/res/assets/templates/macros.cs b/res/assets/templates/macros.cs
index 0cfdb32..317b36e 100644
--- a/res/assets/templates/macros.cs
+++ b/res/assets/templates/macros.cs
@@ -47,7 +47,7 @@
<?cs
def:simple_type_link(type)?><?cs
if:type.link?><?cs
- if:type.federated ?><a href="<?cs var:type.link ?>"><?csvar:type.label ?></a><?cs
+ if:type.federated ?><a href="<?cs var:type.link ?>"><?cs var:type.label ?></a><?cs
else ?><a href="<?cs var:toroot ?><?cs var:type.link ?>"><?cs var:type.label ?></a><?cs
/if?><?cs
else ?><?cs var:type.label ?><?cs
