Merge branch 'master' into moggypatterns
commit2e3c701bc3416cd9a96723b78bf10f9ffc4804fe
authorPetr Baudis <pasky@ucw.cz>
Thu, 7 Mar 2013 01:40:24 +0000 (7 02:40 +0100)
committerPetr Baudis <pasky@ucw.cz>
Thu, 7 Mar 2013 01:40:24 +0000 (7 02:40 +0100)
tree858a8fc711a2493ca93c2f5dd169124b7e526c93
parentbc90d1366581025108bb4e1d92bc25ab7f40884c
parent0c9a575f101c9a9732e1f43f07c713d0bab85cb0
Merge branch 'master' into moggypatterns