Merge remote-tracking branch 'spaetz/formerge/bundle_xml_templates_too'
authorElrond <elrond+mediagoblin.org@samba-tng.org>
Thu, 29 Nov 2012 13:34:16 +0000 (14:34 +0100)
committerElrond <elrond+mediagoblin.org@samba-tng.org>
Thu, 29 Nov 2012 13:34:16 +0000 (14:34 +0100)
commit6adcea2451519d1276e989ac200df8ed43954c48
treec0d40ce3c92eb1e7dd12f4d6efab90420d1cf337
parentf52301d26166b706cbbbe854c83fda3a06e6be9b
parente501c619cbd38a943f513280250ddd3c031ea253
Merge remote-tracking branch 'spaetz/formerge/bundle_xml_templates_too'

* spaetz/formerge/bundle_xml_templates_too:
  Also package webfinger.xml