From d07d0f16c064ddf2f51fb506ea77000d2eebce71 Mon Sep 17 00:00:00 2001
From: Michael Krelin <hacker@klever.net>
Date: Wed, 19 Mar 2014 22:08:01 +0000
Subject: Merge remote-tracking branch 'github/master'

---
(limited to 'backend/node')

--
cgit v0.9.0.2