Merge oxjs fix

This commit is contained in:
j 2014-05-25 15:15:02 +02:00
commit 9d41ed4eaf

File diff suppressed because one or more lines are too long