fixes after upstream merge

This commit is contained in:
Torkel Ödegaard
2013-12-30 11:05:39 +01:00
parent 24e624ba63
commit 1f8f0049fb
5 changed files with 19 additions and 23 deletions
+1 -1
View File
File diff suppressed because one or more lines are too long