Merge branch 'master' into ph
authorKarsten Hilbert <karsten.hilbert@gmx.net>
Mon, 22 Apr 2013 17:06:50 +0000 (19:06 +0200)
committerKarsten Hilbert <karsten.hilbert@gmx.net>
Mon, 22 Apr 2013 17:06:50 +0000 (19:06 +0200)
commitd63aba6e3b6152d25054e09670f073a5537b7e3f
treea225172fbb202c705aa71bc2849098c7c8c59bfd
parent22f3ba2c85cd5eb2572e083dcb7f45ff18ff8398
parentd47c3c8c08eea154f65594cf81bf0cdbf0af538a
Merge branch 'master' into ph

Merge v18 conversion of depreciated placeholders