Merge branch 'mallard-templates'
authorTomeu Vizoso <tomeu.vizoso@collabora.com>
Mon, 20 Feb 2012 17:18:04 +0000 (18:18 +0100)
committerTomeu Vizoso <tomeu.vizoso@collabora.com>
Mon, 20 Feb 2012 17:18:04 +0000 (18:18 +0100)
commitad5c6abcbcd6c1cd26b9a714995c622f5dbe3b07
treec040697e6ad1bb8269351968c3612927d9daea80
parent4fbb34bb0ea4a1d142052e62a29480c704550f8b
parent990b33b9fb5856b62550725bcff29f7e39a488a4
Merge branch 'mallard-templates'