Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorChrysostomos Kolovos <xrklvs@gmail.com>
Tue, 20 May 2014 10:03:11 +0000 (13:03 +0300)
committerChrysostomos Kolovos <xrklvs@gmail.com>
Tue, 20 May 2014 10:03:11 +0000 (13:03 +0300)

Trivial merge