From: Robert Sesek <rsesek@bluestatic.org>
Date: Sun, 12 Aug 2012 18:39:53 +0000 (-0400)
Subject: Merge branch 'Makefile'
X-Git-Tag: 0.9.656.0~15
X-Git-Url: https://src.bluestatic.org/?a=commitdiff_plain;h=4966ca2930a88f3168f707b3048e536a2e341e73;p=armadillo.git

Merge branch 'Makefile'
---

4966ca2930a88f3168f707b3048e536a2e341e73