tree f14ea034b90739dbd91061e599c9b40be3bf50ae
parent a65000918b2d377e10358c2ea58bb58385cf55c3
parent 661fa5ec0a25f3a387bc918d8d346c54faeedf5b
author Filip Pytloun <filip.pytloun@tcpcloud.eu> 1445435818 +0200
committer Filip Pytloun <filip.pytloun@tcpcloud.eu> 1445435818 +0200

Merge branch 'feature/liberty' into 'master'

OpenStack liberty compatability

See merge request !1