]> gitweb.fluxo.info Git - awesompd.git/commitdiff
Merge branch 'fixlist' into develop
authorAlexander Yakushev <yakushev.alex@gmail.com>
Thu, 4 Nov 2010 16:19:40 +0000 (18:19 +0200)
committerAlexander Yakushev <yakushev.alex@gmail.com>
Thu, 4 Nov 2010 16:19:40 +0000 (18:19 +0200)
1  2 
awesompd.lua

diff --cc awesompd.lua
Simple merge