Merge branch 'master' of gitorious.org:mokosuite2/mokowm
authorDaniele Ricci <daniele.athome@gmail.com>
Tue, 7 Dec 2010 16:47:48 +0000 (17:47 +0100)
committerDaniele Ricci <daniele.athome@gmail.com>
Tue, 7 Dec 2010 16:47:48 +0000 (17:47 +0100)
commit1e33640ddb9b52d271233e9539aaec384e8a1fee
tree649fc47f5cb04f51339d02601fc072f6990afb3f
parent614db5209419d8bb214ab1ed706f3562f32a9a2d
parent823d3bfa136a534d97ddb65ec4b2c348ea46afe1
Merge branch 'master' of gitorious.org:mokosuite2/mokowm

Conflicts:
data/Makefile.am

Signed-off-by: Daniele Ricci <daniele.athome@gmail.com>