From: Lars Hjemli <hjemli@gmail.com>
Date: Sun, 18 Jul 2010 13:03:08 +0000 (+0200)
Subject: Merge branch 'lh/macros'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/5c5d189635287a3bfaa1a4aef133dc0c582a27c2

Merge branch 'lh/macros'
---

5c5d189635287a3bfaa1a4aef133dc0c582a27c2