Merge branch 'master' into montage
authorDobrica Pavlinusic <dpavlin@rot13.org>
Mon, 19 Oct 2009 13:39:34 +0000 (15:39 +0200)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Mon, 19 Oct 2009 13:39:34 +0000 (15:39 +0200)
commit7ca4506ad471b9ec666b96a56663d6fb55efe827
tree56912db5bc33cb5117ae687a04f3404bcb2f2624
parent879051bc12760fa631798987a05090939b2fddb8
parent4091511033995066069872683db3bd176673d557
Merge branch 'master' into montage