From: Guilherme Maciel Ferreira <guilherme.maciel.ferreira@intra2net.com>
Date: Fri, 7 Jan 2011 12:17:06 +0000 (+0100)
Subject: Merge branch 'master'
X-Git-Tag: v2.6~90
X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=a3296c11082bd0359db7225d0b21c8ed9e768bc6;p=libi2ncommon

Merge branch 'master'
---