Merge branch 'afs' into phcoder
commit6fbe0b77cecce1acff5184b234c2314686133a9b
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Fri, 17 Jul 2009 19:19:49 +0000 (17 21:19 +0200)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Fri, 17 Jul 2009 19:19:49 +0000 (17 21:19 +0200)
treeb9fc629fb1f1cec543040a3c21c3226cfa08a39d
parent14e42a553dc4845641ba9376eeff67130e614e79
parentba3faa5b6f16840c6cae13bd080ca8930b978f51
Merge branch 'afs' into phcoder

Conflicts:
ChangeLog
ChangeLog