OSDN Git Service

merging upstream changes
authorSteven Verbeek <sverbeek@modernmedia.ca>
Wed, 21 Mar 2012 03:21:34 +0000 (00:21 -0300)
committerSteven Verbeek <sverbeek@modernmedia.ca>
Wed, 21 Mar 2012 03:21:34 +0000 (00:21 -0300)
commitfafc34b0db23844577e0a99273877c956d087d96
tree949c454616f363b7089c2ba1a40d5bfcd2094bc0
parent35d0de8f367e949c3bab50506916ca87eeb5d5ab
parentb57faf9282d7df6cdd62953d474652a0ae2e6896
merging upstream changes
app/assets/stylesheets/common.scss