Merge commit 'refs/merge-requests/4' of git://gitorious.org/elektra-initiative/libele...
authorMarkus Raab <elektra@markus-raab.org>
Fri, 4 Apr 2014 19:18:30 +0000 (21:18 +0200)
committerMarkus Raab <elektra@markus-raab.org>
Fri, 4 Apr 2014 19:18:30 +0000 (21:18 +0200)
commita8e26d74a33b263ca25a18e0965c7071a26abaee
tree3861af808ed380f023c7a00980ea6055596cafe9
parent3daf38d5fe55779e812499c234bdab7653735ab8
parentecb02ddbfbd345aaa82b882bfe88505e49cb07fb
Merge commit 'refs/merge-requests/4' of git://gitorious.org/elektra-initiative/libelektra into integration