From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 15 Oct 2011 16:53:55 +0000 (+0200)
Subject: Merge branch 'capabilities'
X-Git-Tag: 0.9.15~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3fe985e1a88411a2c1b66dcf0b74a68c07a7aefd;p=people%2Fms%2Fpakfire.git

Merge branch 'capabilities'
---

3fe985e1a88411a2c1b66dcf0b74a68c07a7aefd