Merge branch 'master' into glib_parsing
commitee184cc5744349f03a270d8785a7385aeddea388
authorLCID Fire <lcid-fire@gmx.net>
Sun, 27 Apr 2008 10:34:29 +0000 (27 12:34 +0200)
committerLCID Fire <lcid-fire@gmx.net>
Sun, 27 Apr 2008 10:34:29 +0000 (27 12:34 +0200)
tree58221aa33f2450d61062ef217d6779d5625770a7
parentdd3cfb0909278659d6aa8c3ae9cc36a863901a85
parent165eec0ea1c78735dbea3b1bca3e3c4102ede173
Merge branch 'master' into glib_parsing