From: Wukong <rebirthmonkey@gmail.com>
Date: Wed, 18 Nov 2015 20:39:13 +0000 (+0100)
Subject: Merge branch 'r3' to master
X-Git-Tag: colorado.1.0~94^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F95%2F3495%2F1;p=moon.git

Merge branch 'r3' to master
---

ed12c4cf23acb0d6d0189bf67f9df9ffa846916e