From: Oskar Wiksten <oskar.wiksten@gmail.com>
Date: Sun, 7 Oct 2012 16:13:49 +0000 (+0200)
Subject: Merge branch 'conditions'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0c585917b5366f536e344a8bfeef0a657dbf99e1;p=users%2Fmchehab%2Fandors-trail.git

Merge branch 'conditions'
---

0c585917b5366f536e344a8bfeef0a657dbf99e1