Merge branch 'master' into xdxf
authorJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Fri, 6 Aug 2010 12:13:05 +0000 (14:13 +0200)
committerJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Fri, 6 Aug 2010 12:13:05 +0000 (14:13 +0200)
commitbca53e94649734fc84bb711413d8d8860cc6ab2d
tree329fbec2b290808481e08b19f5a808c429fc90a5
parent28f8fe57b0a98b46319ffa4e57f7f7c2a0567309
parentec5a052dc2c1afbda89338e0946936f32d05d84d
Merge branch 'master' into xdxf