tree 01e10560d21b0f823f7948102b28ecbef80d6484
parent c31946949be066c653e90a9cf31cdcdc513319b0
parent 509cdc7c75177a77e5fba784acf98c459d5f57d3
author Filip Pytloun <filip.pytloun@tcpcloud.eu> 1445435812 +0200
committer Filip Pytloun <filip.pytloun@tcpcloud.eu> 1445435812 +0200

Merge branch 'feature/liberty' into 'master'

OpenStack Liberty compatability

See merge request !2