merge changes with timeout change
authorRobert Kaiser <kairo@kairo.at>
Sun, 7 Jul 2013 21:44:05 +0000 (23:44 +0200)
committerRobert Kaiser <kairo@kairo.at>
Sun, 7 Jul 2013 21:44:05 +0000 (23:44 +0200)
commit0a4b9f5f2283b15acacf54d9048d9da0a7f9ab20
treea947596cf1604e6979ffa1ce8281a41a81e6c242
parent582d50fc8e75b19c1d07625d4ce759ea422b08f5
parent81b1b5fe77679daa0c540365e47e2fe9c36fea22
merge changes with timeout change