![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Bernd Zeimetz <bernd@bzed.de> | |
| Tue, 24 Jan 2012 22:08:01 +0000 (23:08 +0100) | ||
| committer | Bernd Zeimetz <bernd@bzed.de> | |
| Tue, 24 Jan 2012 22:08:01 +0000 (23:08 +0100) | ||
| commit | b59bb99492706d1548d6093fb8730bd3666b529e | |
| tree | b11054d65ef46ca8df1feb200d5118ad6661e87a | tree | snapshot |
| parent | 4bb2e9a19348f9e7e7c597f9c11036e321a6124c | commit | diff |
| parent | 23a63bef251017be5fd4f09db2be10575e3df59e | commit | diff |
Merge commit 'upstream/1.4.7'