From: Alexander Yakushev <yakushev.alex@gmail.com>
Date: Wed, 22 Jun 2011 14:02:44 +0000 (+0300)
Subject: Merge branch 'master', remote branch 'origin/master'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=7c921f25dba88c81e0e1c68acb3c35eba316f3c0;p=awesompd.git

Merge branch 'master', remote branch 'origin/master'
---

7c921f25dba88c81e0e1c68acb3c35eba316f3c0