Be consistent. (Updated de_DE.lang)
Update en_US.lang
Merge pull request #374 from Vexatos/patch-7

Be consistent. (Updated de_DE.lang and fixed en_US)
Update ru_RU.lang

Translation updated to latest version of en_US.lang.
Update ru_RU.lang
Make io.read() support support not breaking

If false is passed as second param to io.read() it now will
not perform a line break after hitting return
Small variable name change
Merge pull request #377 from Kilobyte22/nobreak

Make io.read() support support not breaking
Merge pull request #376 from Sodiet/patch-3

Update ru_RU.lang
Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7
Merge branch 'MC1.7' of github.com:MightyPirates/OpenComputers into MC1.7.10
Updated CC API.
Fixed computers crashing when mods cause computers to pause (`context.pause(...)`) in a direct callback (`@Callback(direct = true)`).
Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7

Conflicts:
	src/main/scala/li/cil/oc/server/component/machine/Machine.scala
Merge branch 'MC1.7' of github.com:MightyPirates/OpenComputers into MC1.7.10

Conflicts:
	src/main/scala/li/cil/oc/server/component/machine/Machine.scala