Merge branch 'master' of gitorious.org:lorea/group_alias
authorSem <sembrestels@riseup.net>
Fri, 30 Nov 2012 13:42:05 +0000 (14:42 +0100)
committerSem <sembrestels@riseup.net>
Fri, 30 Nov 2012 13:42:05 +0000 (14:42 +0100)
commitb19bd3219695a20b470e8651659c2892b2f2a58b
treede15b07a84c0c42c9280b205eb080b3c5542694d
parentc19feac0eb713f3deee92cc43861c7223f5d19f4
parent66ed2dbdbe8d3357347a2a3f1298420ccd323ce0
Merge branch 'master' of gitorious.org:lorea/group_alias