Merge branches 'mayfirst' and 'master'
authorSilvio Rhatto <rhatto@riseup.net>
Thu, 24 Mar 2011 18:21:25 +0000 (15:21 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Thu, 24 Mar 2011 18:21:25 +0000 (15:21 -0300)
commit46baf4a692932482cac32eff91d49de461411bac
treef446f85a5250e9b8c990ebe575f198ef6afe278e
parentf3cf4d3642b5967d6677a4d67a0b28a4c4f8babb
Merge branches 'mayfirst' and 'master'