Merge remote-tracking branch 'BostjanOb/patch-1' into bostjan-patch
authorEvan Coury <me@evancoury.com>
Thu, 22 Dec 2011 14:07:33 +0000 (07:07 -0700)
committerEvan Coury <me@evancoury.com>
Thu, 22 Dec 2011 14:07:33 +0000 (07:07 -0700)
commitbb098901d01832d5b2c5e3e7abbd604adcaa4d04
tree23ec5b174f550871e6b5862eff132b73da885a5d
parent6f0edf13b0c344d270841f17ed455fc144b2d0df
parent26b842365013594ee6c41c1c83c3b07adc9f753c
Merge remote-tracking branch 'BostjanOb/patch-1' into bostjan-patch