Merge remote-tracking branch 'origin/master' into patterns
commit0dcad12ce824c46d88bf6b82ab37769d48aee81e
authorPetr Baudis <pasky@ucw.cz>
Sun, 8 Jan 2012 12:06:52 +0000 (8 13:06 +0100)
committerPetr Baudis <pasky@ucw.cz>
Sun, 8 Jan 2012 12:06:52 +0000 (8 13:06 +0100)
treee97e50f17ca4367f2ab7c320d33759ab5d1fe89f
parent44b6c2ed548175a966ca4315a8f416a7fd7550ec
parent050e295139b0fc4442f4e76a3ac22bc79d91a083
Merge remote-tracking branch 'origin/master' into patterns