]> gitweb.fluxo.info Git - awesompd.git/commitdiff
Merge branch 'master', remote branch 'origin/master'
authorAlexander Yakushev <yakushev.alex@gmail.com>
Wed, 22 Jun 2011 14:02:44 +0000 (17:02 +0300)
committerAlexander Yakushev <yakushev.alex@gmail.com>
Wed, 22 Jun 2011 14:02:44 +0000 (17:02 +0300)

Trivial merge