tree 4d435e7bf14db63f5053fb3d14245ce04ba782de
parent 7ccb7ecc8e84f8e4f4cdf5ed10247f4350c7ec34
parent e3a68042c086acfc98ae273adbd8527af0c6ab8b
author Andrey Andreev <narf@bofh.bg> 1330624773 +0200
committer Andrey Andreev <narf@bofh.bg> 1330624773 +0200

Merge upstream branch