Merge remote-tracking branch 'origin/master'
commit79183afd771d96f2b6aa9b7238a1ce7ef4e201ea
authorMichal Čihař <michal@cihar.com>
Wed, 14 Sep 2011 05:29:18 +0000 (14 07:29 +0200)
committerMichal Čihař <michal@cihar.com>
Wed, 14 Sep 2011 05:29:18 +0000 (14 07:29 +0200)
tree0137478dbe91fb4af5c1b50238d93848a827ba64
parentd7cbfd5bf3b9e983c0011a0ad4ef36d0b187f228
parentdd81bf847ae2d055aabdd24ca379575297eeae41
Merge remote-tracking branch 'origin/master'