Merge branch 'maint'
authorAndre Noll <maan@systemlinux.org>
Sun, 3 Nov 2013 11:53:53 +0000 (12:53 +0100)
committerAndre Noll <maan@systemlinux.org>
Sun, 3 Nov 2013 11:53:53 +0000 (12:53 +0100)
commit1e97f6746b605e37826fb6ee2ad35b7b330145d6
treeb6713f07e2cb18642c91ad31ea2189125e13c35e
parentb3644a3f5de245609dc608a947ed71e2f75b2fd5
parent20c8622c90f488ab398146a9e5b51d61149e96d3
Merge branch 'maint'