Merge remote-tracking branch 'origin/master'
authorVadim Pisarevsky <vadim.pisarevsky@itseez.com>
Mon, 24 Sep 2012 11:11:45 +0000 (15:11 +0400)
committerVadim Pisarevsky <vadim.pisarevsky@itseez.com>
Mon, 24 Sep 2012 11:11:45 +0000 (15:11 +0400)
commitda6e3ebff2ab2f13ec5d438ed77973637321545c
tree546a8a1b12d5da9bbf17f4f885bd73b5c4fbf5f0
parentbfc8a524022364a09a75c3308c19ab00e30684a5
parent33983bcbb7c3bcb2b5681e9de756a0a179561958
Merge remote-tracking branch 'origin/master'