From: Alexander Yakushev <yakushev.alex@gmail.com>
Date: Mon, 1 Nov 2010 18:54:00 +0000 (+0200)
Subject: Merge branch 'master' into develop
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=2396661d1024abb824a7ea376791b6016ef688d8;p=awesompd.git

Merge branch 'master' into develop
---

2396661d1024abb824a7ea376791b6016ef688d8