Merge github.com:slackito/wenboi
authorJorge Gorbe <j.gorbe@stcsl.es>
Mon, 27 May 2013 12:15:27 +0000 (14:15 +0200)
committerJorge Gorbe <j.gorbe@stcsl.es>
Mon, 27 May 2013 12:15:27 +0000 (14:15 +0200)

Trivial merge