New branches for the integration branch of bodega-server

[Aaron J. Seigo]

On Monday, May 13, 2013 00:06:31 Giorgos Tsiapaliokas wrote:
> Hello,
> 
> those two branches are ready in order to be merged
> in the integration branch of the bodega-server.
> 
> * terietor/preinstall/scripts

I've merged this

> * terietor/account/activation2

This does not apply cleanly to master, but I've merged it with conflicts 
resolved.

-- 
Aaron J. Seigo
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part.
URL: <http://mail.kde.org/pipermail/active/attachments/20130514/3a1dc5a0/attachment.sig>