tree bd9a5df6b3b8d607d0a6e0b385c2e23900b76e4f
parent c25c3d3d61ff38a348224252c1b3c9041e50ac32
parent 0c4fb6a578d23e5a0fa5c8ce41a75d2b2b1310e7
author Andrey Andreev <narf@bofh.bg> 1327690973 +0200
committer Andrey Andreev <narf@bofh.bg> 1327690973 +0200

Merge upstream branch and fix private methods to be protected