Merge branch 'github/master'
authorDavid Herrmann <dh.herrmann@googlemail.com>
Tue, 23 Oct 2012 09:39:24 +0000 (11:39 +0200)
committerDavid Herrmann <dh.herrmann@googlemail.com>
Tue, 23 Oct 2012 09:39:24 +0000 (11:39 +0200)
commit8a4ddda7423ca12ed6bf4c00668f9901a2e12ac0
tree29cfd141a67a0db86e332b8f48cf83cb051ce798
parent696adf965a5b29411695c397cdc9ce65ec5c4c7d
parent338e1ee0633b29245daf0ac1a82aabcad812876c
Merge branch 'github/master'

Merge upstream development into the config-rework.