Merge pull request #20 from scarabeusiv/master
authorMichael Andres <ma@suse.de>
Thu, 25 Jul 2013 07:01:49 +0000 (00:01 -0700)
committerMichael Andres <ma@suse.de>
Thu, 25 Jul 2013 07:01:49 +0000 (00:01 -0700)
Fix mixing C and C++ in templates


Trivial merge