Merge branch 'master' into testing testing
authorDobrica Pavlinusic <dpavlin@rot13.org>
Tue, 18 Jan 2011 16:33:38 +0000 (17:33 +0100)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Tue, 18 Jan 2011 16:33:38 +0000 (17:33 +0100)
commitbdd6c65026919c9a5d87ceddcbef3d8b219d1595
tree4e6c25c20483efe706fe4a1bae106b71a395b635
parent795bc74a7a1e89b67d55ceac19ccffb245980a0a
parentfa86ada92b229e8df4054e46e4bbcf42b99a9e37
Merge branch 'master' into testing