Merge commit 'refs/merge-requests/3' of git://gitorious.org/elektra-initiative/libele...
authorMarkus Raab <elektra@markus-raab.org>
Fri, 28 Mar 2014 14:32:07 +0000 (15:32 +0100)
committerMarkus Raab <elektra@markus-raab.org>
Fri, 28 Mar 2014 14:32:07 +0000 (15:32 +0100)
commit67f867d1842969ccb91e6bc3ffae6280e7845f1c
tree81b543436cfb68fa31180cf1395fbe56806ccf28
parente7ca2d928a9fd3ce9a0c44a5cbd1162a5f887692
parentb012480429ec3faef7a3f863be48217f5163e7b6
Merge commit 'refs/merge-requests/3' of git://gitorious.org/elektra-initiative/libelektra into manuel