From c392fe28606eefa0c814e5c25d641f5ffe623186 Mon Sep 17 00:00:00 2001
From: Michael Krelin <hacker@klever.net>
Date: Mon, 30 Jun 2014 18:20:13 +0000
Subject: Merge remote-tracking branch 'github/master' into nmaster

---
(limited to 'backend')

--
cgit v0.9.0.2