Merge branch 'master' of linz:/srv/git/lantea
authorRobert Kaiser <robert@widebook.box.kairo.at>
Fri, 23 May 2014 17:53:39 +0000 (19:53 +0200)
committerRobert Kaiser <robert@widebook.box.kairo.at>
Fri, 23 May 2014 17:53:39 +0000 (19:53 +0200)
commitdbeed1023c56a71967c364b871756c56fc2502e8
tree66a981a7ffdc9c2a65a4bf312fa38df6a30226a2
parentbb752fc4f4a183177fe8ac6ea3e5bf6e061a9bb4
parent61b46e9e7d19b38d69ad53aa776bc5001109c5f3
Merge branch 'master' of linz:/srv/git/lantea