Merge branch 'master' of gitorious.org:elektra-initiative/libelektra
authorFelix Berlakovich <elektra@berlakovich.net>
Sun, 23 Mar 2014 12:53:05 +0000 (13:53 +0100)
committerFelix Berlakovich <elektra@berlakovich.net>
Sun, 23 Mar 2014 12:53:05 +0000 (13:53 +0100)
commit1a63320d828af4f285773ca0538fd7a5fc8eadfe
treee73b8b7797df359770adf623ada3ce542cce15d3
parent489941d191b8219c4395e4b4985f1da13b7c528b
parentd64a82ec6cae1f81a01f27a5ff113e0547ede95d
Merge branch 'master' of gitorious.org:elektra-initiative/libelektra